commit | 9b8b20c8801c39c2ce063c16484c1d4eb8edcffd | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:38 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:38 2021 +0000 |
tree | 8c986e32937c71d62844fdcc8157acc6c3377538 | |
parent | 8e88739365ddab2a7ed4a325e9766307140c593e [diff] | |
parent | 156a09762ef8efba6abe8b7f484e136e3e9809f7 [diff] |
[automerger skipped] Merge Android 12 am: f8e47a07be -s ours am: b12ffeee7f -s ours am: 156a09762e -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: I36c19c7ddf95ef0ba5419b696f3c668e34083651