Bug 717283 - Fix build bustage caused by merge conflict in d8fc13006aa4
authorMatt Brubeck <mbrubeck@mozilla.com>
Tue, 24 Jan 2012 08:06:27 -0800
changeset 86466 4976f17b061ac8630839280b298a9198a754514a
parent 86465 cd76470c9e6f24bcf63edce87666d3335058a6a0
child 86467 7cafa419af61f3952e2cd7d875aa6a46f4169dc9
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs717283
milestone12.0a1
Bug 717283 - Fix build bustage caused by merge conflict in d8fc13006aa4
mobile/android/base/GeckoEvent.java
--- a/mobile/android/base/GeckoEvent.java
+++ b/mobile/android/base/GeckoEvent.java
@@ -74,17 +74,17 @@ public class GeckoEvent {
     public static final int ACTIVITY_SHUTDOWN = 11;
     public static final int LOAD_URI = 12;
     public static final int SURFACE_CREATED = 13;
     public static final int SURFACE_DESTROYED = 14;
     public static final int GECKO_EVENT_SYNC = 15;
     public static final int ACTIVITY_START = 17;
     public static final int BROADCAST = 19;
     public static final int VIEWPORT = 20;
-    public static final int VISTITED = 21;
+    public static final int VISITED = 21;
     public static final int NETWORK_CHANGED = 22;
 
     public static final int IME_COMPOSITION_END = 0;
     public static final int IME_COMPOSITION_BEGIN = 1;
     public static final int IME_SET_TEXT = 2;
     public static final int IME_GET_TEXT = 3;
     public static final int IME_DELETE_TEXT = 4;
     public static final int IME_SET_SELECTION = 5;