summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Josep del Río <joseprio@google.com> 2023-07-10 16:03:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-10 16:03:01 +0000
commitbaf0b865c5b11da42ecb1b324ea5631302c743e9 (patch)
treeab0fd4dfb4ab959cfc5111d751cd9cf10bc4a9cb /libs/androidfw/ApkParsing.cpp
parent92019fc099e866b3d1d9962dd1680b3cb8830616 (diff)
parentbda1982e35cd97e8ab541b930fe60833e1557b22 (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 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: If25c271657fd7376080417589fb54a0507c8f872 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