summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author arunvoddu <arunvoddu@google.com> 2023-03-09 21:24:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-09 21:24:20 +0000
commit7dbaaf4a9299090b7f1a4b96ac0b9d435b78a7c6 (patch)
tree3c95819044d1cae08f34850ba3acc624a7a61551 /libs/androidfw/ApkParsing.cpp
parent1332019ece95a32d06904ddd481e2c8f0aa27b08 (diff)
parentdbf42d157c7793f40e2923315ee20e7dd5494c83 (diff)
[automerger skipped] Added string token to CARD support multiple languages am: 87c10e7b60 -s ours am: dbf42d157c -s ours
am skip reason: Merged-In I90551b705381bee71df837b05bb0f3ff7ea98e54 with SHA-1 8269f7038f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2475012 Change-Id: I05d2a0a3ed535f1d62b016ea6197415b8a518e15 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