Merge heads

2012-11-08 17:03:11 +08:00
parent 3f9fd82b92 be257aa4bf
commit e452ca3598
27 changed files with 260 additions and 413 deletions
@@ -234,7 +234,7 @@ public class EndToEndTestUtils {
  * Checks whether the Google Play Services need update.
  */
  private static boolean isGooglePlayServicesLatest() {
-    return !SOLO.searchText(activityMytracks.getString(R.string.common_google_play_services_update_text));
+    return !SOLO.searchText("Google Play services");
  }

  /**