tree 75ef34ca59cffdd3f4443a8304036eb210dfc357
parent 3fcaa09bb024893e93864b30abe65853735735e2
parent 50c2c2740c2a5f8cad90ef4f8813b82914935fd7
author Xin Li <delphij@google.com> 1697741273 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697741273 +0000

[automerger skipped] Merge 10952656 am: 50c2c2740c -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: I509e1cabd56823b38cb7f61fd099c4dd834f3437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>