| commit | bf72fdff02afc920424605560320f06112e568f0 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 21 08:26:57 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 21 08:26:57 2020 +0000 |
| tree | f69c086a9eb40e2e4cdff9c4216c1cedf8b51809 | |
| parent | 4edee83c05ba43efe5796564f004e1440933b2cd [diff] | |
| parent | bacfe3ba96fa9189814e490a9c867b9efb08f675 [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: bacfe3ba96 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1431592 Change-Id: I0e765a47f6f0b62495819cb257c13c975f2f878f