summaryrefslogtreecommitdiff
path: root/telecomm/java/android/telecom/Phone.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-19 12:13:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-19 12:13:32 +0000
commit90dc909c3aa3d3ea4d80957996f40b5b6e9fd211 (patch)
treeee0f777c57ec324bb9e33654df238f0845613412 /telecomm/java/android/telecom/Phone.java
parent5925057673043828b75663b6158dcdb8d77a8ae2 (diff)
parentf6253ef4350a8d0f722b54411da48b9489666b14 (diff)
Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f38 am: 019286764f am: f6253ef435
Change-Id: Id33f64eb9c8aa7d68cc52f7359b4f0a3d2675d8a
Diffstat (limited to 'telecomm/java/android/telecom/Phone.java')
-rw-r--r--telecomm/java/android/telecom/Phone.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/Phone.java b/telecomm/java/android/telecom/Phone.java
index a427ed612b31..61a639a1a235 100644
--- a/telecomm/java/android/telecom/Phone.java
+++ b/telecomm/java/android/telecom/Phone.java
@@ -17,8 +17,8 @@
package android.telecom;
import android.annotation.SystemApi;
+import android.annotation.UnsupportedAppUsage;
import android.bluetooth.BluetoothDevice;
-import android.compat.annotation.UnsupportedAppUsage;
import android.os.Build;
import android.os.Bundle;
import android.util.ArrayMap;