| commit | bacfe3ba96fa9189814e490a9c867b9efb08f675 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:00:56 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:00:56 2020 +0000 |
| tree | 98b379d2cfa66abcd060f96761f4cc735e3b3ad8 | |
| parent | 0b4f3cb2dbd1481a71c585df4407f97bbb4967a5 [diff] | |
| parent | c27305093b960f3d84a1fcfd5dcf6c1a890769f9 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48120deb3b am: 59284aad2a -s ours am: ba618e094b -s ours am: c27305093b -s ours am skip reason: Change-Id I5ae7ac4099e100525ddfbbc93de0936340640b8f with SHA-1 14b56210d9 is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1431592 Change-Id: I8c251656297386cf34729603a842a59f5a2e7968