commit | d2990c378d2c6f713871711e4db72d835d5b058b | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Nov 05 04:57:10 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 05 04:57:10 2020 +0000 |
tree | ef37a31b922628f7f03d159518c3dab65969c68c | |
parent | 6b7f091707e74c3b4e5122da9ab24ba501ae8ccd [diff] | |
parent | 3593bb1f0dc3a4f8af94b7466c6f6ef8fd38db91 [diff] |
[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 09ec386be0 am: 0f08097c7f -s ours am: 6f8ee22c4b -s ours am: 3593bb1f0d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1486850 Change-Id: I77096ccdc8b7e4502889ab4bc359759c8051c2df