summaryrefslogtreecommitdiff
path: root/core/java/android/widget/ArrayAdapter.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-10 15:16:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-10 15:16:49 +0000
commitbd4e71148a77dd742ba3f9adbd0bde0c50eebbd8 (patch)
tree71f465ff16b8685517de500c8b0098115d7cefd5 /core/java/android/widget/ArrayAdapter.java
parentdd605f0c0d6c4d4ba855c4c921160bee6e41c70c (diff)
parent62169a75cc072cba1cf5aa7db591e75d019b2a41 (diff)
Merge "Use new UnsupportedAppUsage annotation." am: 39f329c52a am: 62169a75cc
Change-Id: Ib94ae7e9f19c543d0180e3a547fc02f55c055ca7
Diffstat (limited to 'core/java/android/widget/ArrayAdapter.java')
-rw-r--r--core/java/android/widget/ArrayAdapter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/ArrayAdapter.java b/core/java/android/widget/ArrayAdapter.java
index f7225d036e15..de9f76d6eea1 100644
--- a/core/java/android/widget/ArrayAdapter.java
+++ b/core/java/android/widget/ArrayAdapter.java
@@ -21,7 +21,7 @@ import android.annotation.IdRes;
import android.annotation.LayoutRes;
import android.annotation.NonNull;
import android.annotation.Nullable;
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.content.res.Resources;
import android.util.Log;