diff options
| author | 2023-03-09 20:03:36 +0000 | |
|---|---|---|
| committer | 2023-03-09 20:03:36 +0000 | |
| commit | c36b24ba04c0ca3c5822e3a7efb291331a6b24a5 (patch) | |
| tree | 1812f869f856db366b968465b6eb2ec6b1b2b8d2 /libs/androidfw/ApkParsing.cpp | |
| parent | 0096855cd13391aa4aa4fdd0deae0df35ee8174b (diff) | |
| parent | 6739b5a55d6b9f12fc36deaf0128fcfd8aa96f4f (diff) | |
[automerger skipped] Merge "Added string token to CARD support multiple languages" into stage-aosp-master am: a92c752943 -s ours am: 6739b5a55d -s ours
am skip reason: Merged-In I90551b705381bee71df837b05bb0f3ff7ea98e54 with SHA-1 33c9adcaa9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21923449
Change-Id: I080899930b67924c39994156cbefeef09b7a344d
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