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

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: I496b1e4589084ed8826b392fa99c72e360fc01fc

...

This commit is contained in:

Treehugger Robot

2020-09-04 12:53:23 +00:00

committed by Automerger Merge Worker

parent 027e5760b4 e18dc3c379

commit 70c9ae224c

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