| commit | 495e8b5c8bb2e41636822b29e9dd3b054b9dbcf5 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 21 08:27:47 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 21 08:27:47 2020 +0000 |
| tree | f69c086a9eb40e2e4cdff9c4216c1cedf8b51809 | |
| parent | bf72fdff02afc920424605560320f06112e568f0 [diff] | |
| parent | 9bebc75c6f99aba15b3825350a7da2fa90fb9750 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 167aa5da4d am: bcf8c7a9db -s ours am: 561264882b -s ours am: 87d7e84885 -s ours am: 9bebc75c6f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1431592 Change-Id: I0f2ff6fae42c307a244a2e7043b05765346af8a2