[automerger skipped] Merge "Added string token to CARD support multiple languages" into tm-qpr-dev-plus-aosp am: f32f79e021 -s ours

Browse Source

am skip reason: Merged-In I90551b705381bee71df837b05bb0f3ff7ea98e54 with SHA-1 a0354d4d5c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21931105

Change-Id: Idf998bd1f7998d6e97787bd9200bff8a1ac6142b
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:56:44 +00:00

committed by Automerger Merge Worker

parent c59830b973 f32f79e021

commit f265a8c5ef

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