summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Josep del Río <joseprio@google.com> 2023-07-10 14:35:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-10 14:35:30 +0000
commit458c17a5aebb5db91cc33b5a33b3972a1e466473 (patch)
tree9855581ec77848fa1b6d056599382497a9833d73 /libs/androidfw/ApkParsing.cpp
parent8bcc2965641d202d4e2a794a5627ce917cc8cd14 (diff)
parent83d362e91d56c3ceb7a04dc87c0274fbc3ace145 (diff)
[automerger skipped] Merge "Do not share key mappings with JNI object" into rvc-dev am: 6676e5a88b am: 83d362e91d -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: Icfbad10c769ba3074855e6268cf5bbf6b5974098 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