Manually merge remaining differences from m-c to ionmonkey.
authorDavid Anderson <danderson@mozilla.com>
Wed, 08 Feb 2012 19:30:39 -0800
changeset 112672 151228e4adeb28caecb40a2aa09b3bd3b9b517cc
parent 112671 ed637f826ef6c4c5e32cce51d6477203dd2b9d50
child 112673 ff9351290e23bfb17b90bc58aec8c67169556907
push id239
push userakeybl@mozilla.com
push dateThu, 03 Jan 2013 21:54:43 +0000
treeherdermozilla-release@3a7b66445659 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Manually merge remaining differences from m-c to ionmonkey.
build/mobile/robocop/Actions.java.in
--- a/build/mobile/robocop/Actions.java.in
+++ b/build/mobile/robocop/Actions.java.in
@@ -52,21 +52,16 @@ public interface Actions {
     public boolean eventReceived();
   }
 
   public interface RepeatedEventExpecter extends EventExpecter {
     /** Blocks until at least one event has been received, and no events have been received in the last <code>millis</code> milliseconds. */
     public void blockUntilClear(long millis);
   }
 
-  public interface RepeatedEventExpecter extends EventExpecter {
-    /** Blocks until at least one event has been received, and no events have been received in the last <code>millis</code> milliseconds. */
-    public void blockUntilClear(long millis);
-  }
-
   /**
    * Listens for a gecko event to be sent from the Gecko instance.
    * The returned object can be used to test if the event has been
    * received. Note that only one event is listened for.
    * 
    * @param geckoEvent The geckoEvent JSONObject's type
    */
   EventExpecter expectGeckoEvent(String geckoEvent);