Merge heads

2012-11-09 11:28:27 +08:00
parent bb23372b4d e452ca3598
commit 4c457c093c
3 changed files with 141 additions and 6 deletions
@@ -116,8 +116,8 @@ public class EndToEndTestUtils {
    MILE_MULTILINGUAL.put("zh", "英里");
  }

-  static Solo SOLO;
-  static Instrumentation instrumentation;
+  public static Solo SOLO;
+  public static Instrumentation instrumentation;
  static TrackListActivity activityMytracks;
  // Check whether the UI has an action bar which is related with the version of
  // Android OS.