[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 048c86339c -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: Iafe6467adf2f0e4fbda01f8feb57296769d71899

...

This commit is contained in:

Treehugger Robot

2021-07-04 16:26:10 +00:00

committed by Automerger Merge Worker

parent 4839681223 048c86339c

commit 33a27bf09a

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