commit | fa54695e0c3ee9a98f2ea9ea3ff4fa749f2f556d | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Mar 09 10:05:34 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 10:05:34 2022 +0000 |
tree | 71869222d5935c162d629ed7960274685c9d56ac | |
parent | 0da4971e6a0db0260e01c493cd05594c5a283a4a [diff] | |
parent | 6bf6d91b6f187785aaacbdc834958bcf3bed2eed [diff] |
[automerger skipped] Merge "Merge Android 12L" am: 470cc63243 -s ours am: 1f4c14a0c7 -s ours am: 6bf6d91b6f -s ours am skip reason: Merged-In Ida76321ddb16fb47ba5204d106e7e6c2f1bb8457 with SHA-1 5ed511b3d7 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/2013183 Change-Id: I96347c428f9c87b306c5457901aaf3052f3c2498