| commit | f683515514fb7adb736462699ad092cb5d9425d4 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 10 03:05:16 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:05:16 2020 +0000 |
| tree | 4cd41db29a1140b9794056fcd3939e73653806cf | |
| parent | dba368f4f5af8828355a7fc61c4797c2534582a4 [diff] | |
| parent | 7bf03ae1a8e458b5b43b9dfd1f978862193f46aa [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 7bf03ae1a8 -s ours am skip reason: Change-Id Ia0de45a302aabac7e90b1c1f8560199cd69b0238 with SHA-1 3d467f7b25 is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1520608 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibeec34e063a59fbb87332b45a284b981a5b21373