commit | bec3f043e9e719a56b7029954ffa76b96a64f7a2 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 08:59:49 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:59:49 2021 +0000 |
tree | bd9b594bba925ceca6f694104d0109c225dc2e3a | |
parent | 791e2de648214defb00651c99d7a224758f598a9 [diff] | |
parent | 2db7a9bd9c722165ec7213302752b1d8bcb30e88 [diff] |
[automerger skipped] Merge Android 12 am: b2eae53071 -s ours am: 08252fe717 -s ours am: 5d7f0460b9 -s ours am: 11e8a814a2 -s ours am: 2db7a9bd9c -s ours am skip reason: Merged-In I30b71cd8e60526def44f87137037b965d969834c with SHA-1 d3b2f71bea is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/ArtPrebuilt/+/1847387 Change-Id: I1390d542389c2d851b9252198621418ed43033d9