| commit | e2f39ac6cc08d860c2647a55e8db1563105ad4fc | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:59:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:59:41 2021 +0000 |
| tree | 7ba88fb414e185bb450556ad74b353b5cf34ba0a | |
| parent | ae42ba89df874365c8454fa778ca0c35b7cc0deb [diff] | |
| parent | e61fa41f0d1df2c1c78e4b63e8c05c4f23fdd95c [diff] |
[automerger skipped] Merge "Merge Android 12" am: b9b28016e6 -s ours am: 9a82d5d3f3 -s ours am: ef79b326ef -s ours am: 625ebd3f7a -s ours am: e61fa41f0d -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: Icbcc46a9349e59fb887b78ab6bdaa151ba31c81e