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

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: I4bce12392f0c0c9f765102ad74285a50d4a4b1f0

...

This commit is contained in:

Treehugger Robot

2020-09-04 19:20:10 +00:00

committed by Automerger Merge Worker

parent c72008725e a589e31259

commit e5b03889a1

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