Merge changes from topic "am-f4ec2204-fd91-49e6-8328-41eaf99a20db" into ub-launcher3-master

* changes:
  [automerger] Fix @SuppressWarnings('deprecation') typo. am: 7927b03287
  Fix @SuppressWarnings('deprecation') typo.

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

@@ -130,7 +130,7 @@ public class IconShapeOverride {
         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;