[automerger skipped] Merge "Added string token to CARD support multiple languages" am: 1c46ad7dfc -s ours

Browse Source

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

...

This commit is contained in:

Treehugger Robot

2023-03-09 21:08:52 +00:00

committed by Automerger Merge Worker

parent dbf42d157c 1c46ad7dfc

commit 9392e58241

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