diff options
| author | 2023-07-10 15:17:43 +0000 | |
|---|---|---|
| committer | 2023-07-10 15:17:43 +0000 | |
| commit | bda1982e35cd97e8ab541b930fe60833e1557b22 (patch) | |
| tree | 42460e0d9cef7346458863c100c9d4b6215e42eb /libs/androidfw/ApkParsing.cpp | |
| parent | 4c58d503e6f34814c2adcead4eeeb0ebb0494874 (diff) | |
| parent | 458c17a5aebb5db91cc33b5a33b3972a1e466473 (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 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: Id38fa48faaed0ca3a5d60694ab2024cbff09ac68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions