commit | 0a4cd558413748ac323833e74e355be78ef2a724 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 07:57:08 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:57:08 2021 +0000 |
tree | 31d977c9424fff6f4e0d791dc6c1512bcd968c76 | |
parent | a6fa6c0e3eb97365eacec9f31b3e4ed2c4225bbb [diff] | |
parent | c5aeaf2b58d26377ebc632dfd3d6f733036293a6 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 3c2f8349f2 -s ours am: adefc05788 -s ours am: c5aeaf2b58 -s ours am skip reason: Merged-In Ibf274d5809120d2ca58dd35865d8ec0a76b9925a with SHA-1 0ce1327bf5 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/tools/+/1847953 Change-Id: I261d9f7e4c6d6caac9a7ef340a72822b170532be