commit | 1fa01d73161467b8f2a0753bca3ec5bfef7bcab1 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 08:29:36 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:29:36 2021 +0000 |
tree | 8c986e32937c71d62844fdcc8157acc6c3377538 | |
parent | cc3e03f54cf45167187700f02784fc6ea3dae07d [diff] | |
parent | 9b8b20c8801c39c2ce063c16484c1d4eb8edcffd [diff] |
[automerger skipped] Merge Android 12 am: f8e47a07be -s ours am: b12ffeee7f -s ours am: 156a09762e -s ours am: 9b8b20c880 -s ours am skip reason: Merged-In I965e46e02e7c0f58a7d93244526a8b54f63a1913 with SHA-1 d50b4c7322 is already in history Original change: https://android-review.googlesource.com/c/platform/external/adt-infra/+/1847420 Change-Id: Ie7bc262fbbb9045d90bfe34e4c2093ecefb3571f