commit | cfd901e4d6391e93d7f14d93a96360a67a40634a | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 03:13:59 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 03:13:59 2021 +0000 |
tree | 4cbe26c806c20dd27e3e7785eee50da27691f9d1 | |
parent | bdcf15bd9fda10fb4465381c51b7999a1507b36a [diff] | |
parent | bfc9682134940f3ad2c866c6f5a673a658a52bc2 [diff] |
[automerger skipped] Merge Android 12 am: 2fb4af2536 -s ours am: bba0ae9a24 -s ours am: 16c5ebd67c -s ours am: bfc9682134 -s ours am skip reason: Merged-In I9222a8945e6802e22b765fb053ed85eda688f805 with SHA-1 ec225826dc is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/vndk/v31/+/1847917 Change-Id: Iea2688b297e5178bee383c26d349178f6971b725