| commit | 970a231764305d10c6f63e05132cd13f9e808c78 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Sep 11 00:40:31 2020 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Sep 11 00:40:31 2020 +0000 |
| tree | e67f720984bacb763fa054c650e0163bf695e3e3 | |
| parent | a7fa0bf87056b96e4a494db432c7a6eb9c8adfa7 [diff] | |
| parent | bc89ff52e59c954518f0daf632775d39b56d2e5f [diff] |
[automerger skipped] Merge Android R am: bc89ff52e5 -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: I7201317de62879c4c92231eaa7defa48819784db