tree ed4c16ce43a799443faffa3b661f50039d4ff76e
parent b7cdf324a0b4f3a857e2d8c263c8689cdf07b52e
parent e7de0d85e67d24542a23a8041dc85b89d4eeaeba
author Xin Li <delphij@google.com> 1633657181 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657181 +0000

[automerger skipped] Merge Android 12 am: 092176baf6 -s ours am: e7de0d85e6 -s ours

am skip reason: Merged-In I9005a2833ba6df815b108ff213286afca56df475 with SHA-1 6d9dbe2823 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/StorageManager/+/1847328

Change-Id: Iaab911037ec6827c79d88d0fcbf0eac0602600ec