commit bcf1a9217c44004b607763ebe00563dbfc8c4e7e
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 29 18:23:04 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 29 18:23:04 2017 +0000
tree 0beea6dba7642641d996ca375e0f7001a15c6154
parent a6abdd6d436472e951df48837ea99762d4ceb2a5
parent 17cf3b1ad78f849b54b3c0d0a4cccc21e98c85cd

Merge changes from topic "am-8538fe8c-8826-45fb-b75a-398ba33cc369" into ub-launcher3-master

* changes:
  [automerger] Disable debugging on Widgets Diff Reporter Bug: 65160070 am: 36628a1122
  Disable debugging on Widgets Diff Reporter Bug: 65160070

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;