summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-12-11 23:01:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-11 23:01:03 +0000
commitfc5f33dc5ac601e5bbade4f78318e2ab03ca8715 (patch)
tree6b6e7fba1e3e32692ae6aae50d76a3227b2b1740
parent62e2df2723cc5ebd8e38603a7e485f72bd69a1f8 (diff)
parent5f95d51dfbd8f459366cc00144986fedfe40d60b (diff)
downloadMediaProvider-fc5f33dc5ac601e5bbade4f78318e2ab03ca8715.tar.gz
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 8011db0f64 -s ours am: 18582576af -s ours am: 5f95d51dfb -s ours
am skip reason: Merged-In Id5c5f0bdd69491739a4dccff677265369870a1d7 with SHA-1 8550530592 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2866053 Change-Id: Iebda3c2f2a8d23d7ed294c46210cd1e336fa2b18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions