| commit | 9160f79001cce05e1a8236ccabfd196e9e640146 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:29:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:29:57 2021 +0000 |
| tree | 9c672b3612ee00507a4e9e6fe6c646500a5a8778 | |
| parent | a56944fe2ce567a5243b57f93a4a754ede3f7497 [diff] | |
| parent | 5c9045225ffde4a8f1f42d4946d8d4e0697d6b2e [diff] |
[automerger skipped] Merge "Merge Android 12" am: e91d2d0d73 -s ours am: 501138cdd4 -s ours am: 5f98e1556e -s ours am: 5c9045225f -s ours am skip reason: Merged-In I1bc4fd0eaea362b1a0d10a2187572b29a0c35fad with SHA-1 03595b9291 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1847369 Change-Id: I65d9f9e3e05e70dd0edf92429be5e86106f50d6b