commit | 156a09762ef8efba6abe8b7f484e136e3e9809f7 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:23 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:23 2021 +0000 |
tree | 8c986e32937c71d62844fdcc8157acc6c3377538 | |
parent | 3c8be6ebe6014697f552214214e68a85b2cb474d [diff] | |
parent | b12ffeee7f0777fb85d9c1244182989af87b460d [diff] |
[automerger skipped] Merge Android 12 am: f8e47a07be -s ours am: b12ffeee7f -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: I1c8e8f3c8777fd3733afc50562ce1a15c11a4135