tree de22be427397babda6e4d93d65c9f1277e4f81e8
parent 3a5c79c3f656941446890b1f36c3552ecae11457
parent baf0b865c5b11da42ecb1b324ea5631302c743e9
author Josep del Río <joseprio@google.com> 1689007178 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1689007178 +0000

[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 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: Ie2a9b1474e9a875bbdcd6310a29da0f6ddeff8b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>