tree a829a88e53cc38623429540c0e4ecc04d3b99097
parent fe93c995364cb475566c514a85059115b9cf7b7b
parent 1c003d125ecf627dc367be77b29513846909812a
author Bill Yi <byi@google.com> 1618360269 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618360269 +0000

[automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 1c003d125e -s ours

am skip reason: skip tag Change-Id I1c799e49c0c6729648cc576cbfd90429f0062985 with SHA-1 fe93c99536 is already in history

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

Change-Id: I0a7a6f22c7368b3a852da9523c53dc50789919bc