tree e82cb75a38776840eb3954ddefe2782c4c7f4291
parent 4a8b399f0a4652e8517174a3fccbcd68de9271b4
parent 65c8bd6f10fa52c110caa4e95eef9193e7b604c8
author Xin Li <delphij@google.com> 1633656020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633656020 +0000

[automerger skipped] Merge "Merge Android 12" am: 65c8bd6f10 -s ours

am skip reason: Merged-In Iccbc0d804f2115e83f8eb2889a57b66b77e0cd27 with SHA-1 4a8b399f0a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1847855

Change-Id: I84791c1e06acacf53178eb40899b5f8f025f4b5b