| commit | 8c968172f31added8f10b74144eaec23ffffb846 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Sep 11 03:59:12 2020 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Sep 11 03:59:12 2020 +0000 |
| tree | e67f720984bacb763fa054c650e0163bf695e3e3 | |
| parent | 4c93650f4242d427ffc98856651f59e109be7203 [diff] | |
| parent | 41a9aef732469e72b20103ce4e1958732151c6ef [diff] |
[automerger skipped] Merge Android R am: bc89ff52e5 -s ours am: 970a231764 -s ours am: ba680f7a20 -s ours am: 41a9aef732 -s ours am skip reason: Change-Id I1ae4134b93e99fc56cc0935e0e78df197e0d9487 with SHA-1 a7fa0bf870 is in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/1422514 Change-Id: I8f9a0c084b393445dc9dc8f617fd410bf4b742fa