| commit | c27305093b960f3d84a1fcfd5dcf6c1a890769f9 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 07:00:51 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:00:51 2020 +0000 |
| tree | 8edd5a78d80359bcddf9b8916cd8782e9095907f | |
| parent | a31983992216c558b2c2540c6de54149409be0e4 [diff] | |
| parent | ba618e094b008bf029d17c0cdf4ab81acd92e9f3 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48120deb3b am: 59284aad2a -s ours am: ba618e094b -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: I9ad9596af5170fa0570c90c4189c63c0fa768b3f