summaryrefslogtreecommitdiff
path: root/media/java/android/mtp/MtpPropertyList.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-18 16:31:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-18 16:31:41 +0000
commit277353090cbb27a55f4050bf16bc800b0d6f825e (patch)
tree58f0ad9b92d77a7784a409870185e44d0f4e5fe7 /media/java/android/mtp/MtpPropertyList.java
parentedd82314a962fccd96981d556994c6e6509afd30 (diff)
parentc7f44bacbe788923177355bd4f82b65414472e45 (diff)
Merge "Use new UnsupportedAppUsage annotation." am: 1385dca8f6 am: 068a9faf3d am: c7f44bacbe
Change-Id: I30839db2fe99ba4670ec1b39d5e64540fdd15f69
Diffstat (limited to 'media/java/android/mtp/MtpPropertyList.java')
-rw-r--r--media/java/android/mtp/MtpPropertyList.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/mtp/MtpPropertyList.java b/media/java/android/mtp/MtpPropertyList.java
index 557f099c25c1..53d838d84518 100644
--- a/media/java/android/mtp/MtpPropertyList.java
+++ b/media/java/android/mtp/MtpPropertyList.java
@@ -16,7 +16,8 @@
package android.mtp;
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
+
import java.util.ArrayList;
import java.util.List;