| commit | 561264882b0f7c83f5105136db812f3bbd35c9b8 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 05:51:17 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:51:17 2020 +0000 |
| tree | 8edd5a78d80359bcddf9b8916cd8782e9095907f | |
| parent | ba618e094b008bf029d17c0cdf4ab81acd92e9f3 [diff] | |
| parent | bcf8c7a9dbb23a8d9eef442b610f30372e3a366b [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 167aa5da4d am: bcf8c7a9db -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: Id418d47a82372d111ab7d0dd9e369f1ecacf5444