diff options
| author | 2023-03-09 21:24:29 +0000 | |
|---|---|---|
| committer | 2023-03-09 21:24:29 +0000 | |
| commit | b4fe928b809312a4c391d324fff30e478bc3445d (patch) | |
| tree | 3c95819044d1cae08f34850ba3acc624a7a61551 /libs/androidfw/ApkParsing.cpp | |
| parent | 7dbaaf4a9299090b7f1a4b96ac0b9d435b78a7c6 (diff) | |
| parent | 9392e58241d5f5800dd439d85507c598195d3759 (diff) | |
[automerger skipped] Merge "Added string token to CARD support multiple languages" am: 1c46ad7dfc -s ours am: 9392e58241 -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: I6321ebb445cba0840e6b2e40e1e7ad881b789b07
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