commit 52c656d77ce4e3ca95314aad3eaa7887c6c8796f
author Tony <twickham@google.com> Fri Jun 09 19:41:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 09 19:41:42 2017 +0000
tree c0108158b1decba07c34c07659d121e558addfa8
parent 6958fda4ad3a9b573a563bb908def3114424421e
parent 7e0801eafb1163f1f3b8416739a36dcf26610215

Merge branch 'ub-launcher3-dorval' into launcher3merge
am: 7e0801eafb

Change-Id: I3c5bf0a79aca97e7385ec6d066d1f93069ccfea5

src/com/android/launcher3/graphics/IconShapeOverride.java

diff --git a/src/com/android/launcher3/graphics/IconShapeOverride.java b/src/com/android/launcher3/graphics/IconShapeOverride.java
index 6e4d366..f78f8a5 100644
--- a/src/com/android/launcher3/graphics/IconShapeOverride.java
+++ b/src/com/android/launcher3/graphics/IconShapeOverride.java
@@ -134,7 +134,7 @@
         private final int mOverrideId;
         private final String mOverrideValue;
 
-        @SuppressWarnings("deprecated")
+        @SuppressWarnings("deprecation")
         public ResourcesOverride(Resources parent, int overrideId, String overrideValue) {
             super(parent.getAssets(), parent.getDisplayMetrics(), parent.getConfiguration());
             mOverrideId = overrideId;

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index c7d4737..6e6453c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -20,8 +20,8 @@
 LOCAL_STATIC_JAVA_LIBRARIES := \
 	android-support-test \
 	ub-uiautomator \
-	mockito-target-minus-junit4 \
-	legacy-android-test
+	legacy-android-test \
+	mockito-target-minus-junit4
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml