commit | b2fcb236e45371e73d604ba724d3b00843c69ae9 | [log] [tgz] |
---|---|---|
author | Josep del Río <joseprio@google.com> | Mon Jul 10 18:09:03 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 10 18:09:03 2023 +0000 |
tree | db6bc71cf1daf0a2a2327e824c38265b6d16da16 | |
parent | 8ff98e96b1db607a7a0295919503d558cac5cf85 [diff] | |
parent | 5fa491d5649feb35ba262ffbd6f72e957ac05302 [diff] |
[automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -s ours am: 458c17a5ae -s ours am: bda1982e35 -s ours am: baf0b865c5 -s ours am: c93d0f50d7 -s ours am: 5fa491d564 -s ours am skip reason: Merged-In I745008a0a8ea30830660c45dcebee917b3913d13 with SHA-1 3d993de0d1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23792288 Change-Id: I51295992f9b214e82c970910f8a9f8d7697b6cb7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>