am a507ceec: am 226cf886: Merge "Fix 2 lint warnings"

* commit 'a507ceecfa8a40f02ef8124d9626c51de69f43ed':
  Fix 2 lint warnings

2 files changed, 4 insertions, 3 deletions

diff --git a/build.gradle b/build.gradle
index 47af871..0128b26 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         // this requires Gradle 2
         classpath 'com.android.tools.build:gradle:1.0.1'
         classpath 'com.github.dcendents:android-maven-plugin:1.2'
-        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
+        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
     }
 }
 
diff --git a/src/com/google/android/droiddriver/base/DroidDriverContext.java b/src/com/google/android/droiddriver/base/DroidDriverContext.java
index a306bc0..0771086 100644
--- a/src/com/google/android/droiddriver/base/DroidDriverContext.java
+++ b/src/com/google/android/droiddriver/base/DroidDriverContext.java
@@ -25,6 +25,7 @@ import com.google.android.droiddriver.exceptions.TimeoutException;
 import com.google.android.droiddriver.finders.ByXPath;
 import com.google.android.droiddriver.util.Logs;
 
+import java.util.Locale;
 import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.concurrent.ExecutionException;
@@ -92,7 +93,7 @@ public class DroidDriverContext<R, E extends BaseUiElement<R, E>> {
     } catch (ExecutionException e) {
       throw new DroidDriverException(e);
     } catch (java.util.concurrent.TimeoutException e) {
-      Logs.log(Log.DEBUG, String.format(
+      Logs.log(Log.DEBUG, String.format(Locale.US,
           "Timed out after %d milliseconds waiting for idle on main looper", timeoutMillis));
       return false;
     }
@@ -135,7 +136,7 @@ public class DroidDriverContext<R, E extends BaseUiElement<R, E>> {
   }
 
   private String getRunOnMainSyncTimeoutMessage(long timeoutMillis) {
-    return String.format(
+    return String.format(Locale.US,
         "Timed out after %d milliseconds waiting for Instrumentation.runOnMainSync", timeoutMillis);
   }