commit a6abdd6d436472e951df48837ea99762d4ceb2a5
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 29 18:17:00 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 29 18:17:00 2017 +0000
tree 5c04e374eb7e4e2ebf7ff921349e8ea8ae082041
parent 9a7a850df8a631294fb5f6f4d6a721203c5803e2
parent 7289d14bac8a51999032e222342c0f7ac2cec431

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

diff --git a/src/com/android/launcher3/graphics/IconShapeOverride.java b/src/com/android/launcher3/graphics/IconShapeOverride.java
index e2d1d50..654fa98 100644
--- a/src/com/android/launcher3/graphics/IconShapeOverride.java
+++ b/src/com/android/launcher3/graphics/IconShapeOverride.java
@@ -130,7 +130,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;