[automerger skipped] Merge "Added string token to CARD support multiple languages" into stage-aosp-master am: a92c752943 -s ours

Browse Source

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: If60f0e9ec640682ac9166b31254da7cf3329d69c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Jack Yu

2023-03-09 19:55:15 +00:00

committed by Automerger Merge Worker

parent e88069a69b a92c752943

commit 6739b5a55d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available