| commit | 625ebd3f7abf7e6c5ff29e34c4f5acaf681f6a0c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:32 2021 +0000 |
| tree | a395fa73f478d88160664682f458277b15a56f5d | |
| parent | 0ce85eaf51c67d1a2a7e71cf6eb0df992772c9eb [diff] | |
| parent | ef79b326efdc2e8d969bad778bb3160aed245971 [diff] |
[automerger skipped] Merge "Merge Android 12" am: b9b28016e6 -s ours am: 9a82d5d3f3 -s ours am: ef79b326ef -s ours am skip reason: Merged-In I92a002aa926d8d48637e35b26c41ef65026e8eed with SHA-1 ab1d0dc36e is already in history Original change: https://android-review.googlesource.com/c/platform/build/+/1847373 Change-Id: I910a0fa924479b12c874c89967a1ed79123f9718