Merge "Mechanical Refactoring to use public androidx - Pools, Nullable."

2 files changed, 3 insertions, 3 deletions

diff --git a/src/com/android/documentsui/ContentLock.java b/src/com/android/documentsui/ContentLock.java
index d9f0346ca..1a01f63a2 100644
--- a/src/com/android/documentsui/ContentLock.java
+++ b/src/com/android/documentsui/ContentLock.java
@@ -15,9 +15,8 @@
  */
 package com.android.documentsui;
 
-import android.annotation.Nullable;
-
 import androidx.annotation.GuardedBy;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.selection.OperationMonitor;
 
 /**
diff --git a/src/com/android/documentsui/ThumbnailCache.java b/src/com/android/documentsui/ThumbnailCache.java
index 580fc8d84..b98ee20ca 100644
--- a/src/com/android/documentsui/ThumbnailCache.java
+++ b/src/com/android/documentsui/ThumbnailCache.java
@@ -18,13 +18,14 @@ package com.android.documentsui;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
+import androidx.core.util.Pools;
+
 import android.content.ComponentCallbacks2;
 import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.net.Uri;
 import android.util.LruCache;
 import android.util.Pair;
-import android.util.Pools;
 
 import com.android.documentsui.base.Shared;