Merge "Do not share key mappings with JNI object" into sc-dev am: 4a45e9c435 am: 77cbfcd9a8 am: c6952e05d1 am: b3bb4cfe8a am: d25574f3df am: 5be3efe8f2 am: 540e5fe270 am: 49272a77ad am: 305ab81739
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23785419 Change-Id: Ia913e2c4d29f2e88eb1b642e9ef1e6073501bc21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: