[automerger skipped] Merge "Added string token to CARD support multiple languages" into stage-aosp-master am: a92c752943 -s ours am: 6739b5a55d -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: I080899930b67924c39994156cbefeef09b7a344d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Jack Yu

2023-03-09 20:03:36 +00:00

committed by Automerger Merge Worker

parent 0096855cd1 6739b5a55d

commit c36b24ba04

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