tree 22d2248c1d8626bc39e49816e0d00491723a43d1
parent c7e136fa1b49fee74096ff76fcbf2511555b960f
parent 65c69883024f6992210d0a23829f8d15ea5cb1a6
author Xin Li <delphij@google.com> 1697759678 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697759678 +0000

[automerger skipped] Merge 10952656 am: 50c2c2740c -s ours am: 65c6988302 -s ours

am skip reason: Merged-In Ic68156f666c56c73ffd82adb08a49a7f398202d6 with SHA-1 3fcaa09bb0 is already in history

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

Change-Id: Ia04812698a2128ebaf14b6c61cdc603cb510a61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>