commit a0e0b3401307f4d8529fd027a1cb09e0c4a7c28b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 09 16:15:31 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 09 16:15:31 2020 +0000
tree f3a8b4356b6ba19290671a6cb8acaa1a1442078f
parent 44358d9d8fc149f8f5ed4209efeda12bff5b4218
parent 57f5cccd29c258a92f1898365aea5badc335394a

Merge "Use new UnsupportedAppUsage annotation." am: 57f5cccd29 am: fe3063fb71

Change-Id: Iea82f97f0ba766ce3f435630175aea48ca47f12f

core/java/android/app/usage/NetworkStatsManager.java

diff --git a/core/java/android/app/usage/NetworkStatsManager.java b/core/java/android/app/usage/NetworkStatsManager.java
index 6bade90..7412970 100644
--- a/core/java/android/app/usage/NetworkStatsManager.java
+++ b/core/java/android/app/usage/NetworkStatsManager.java
@@ -21,8 +21,8 @@
 import android.annotation.Nullable;
 import android.annotation.SystemService;
 import android.annotation.TestApi;
-import android.annotation.UnsupportedAppUsage;
 import android.app.usage.NetworkStats.Bucket;
+import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.DataUsageRequest;