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

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: Ifdaf5240206bb265b77ee02dcdd8e500e8489e3d

...

This commit is contained in:

Treehugger Robot

2020-09-04 19:12:19 +00:00

committed by Automerger Merge Worker

parent 6480a4098e cba3e24417

commit 65d2525269

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