[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a589e31259 -s ours am: e5b03889a1 -s ours am: 587aa366bc -s ours am: 21ab14fc64 -s ours am: 83483199f6 -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: I52766ee9e17e0dcead1cb74720f5c643824d3c1b

...

This commit is contained in:

Treehugger Robot

2020-09-04 20:18:16 +00:00

committed by Automerger Merge Worker

parent adcae31ea6 83483199f6

commit 83321222d8

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