Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2414b21d4e -s ours am: 5bef533f30 -s ours" into rvc-d1-dev-plus-aosp am: 87cfefce3e -s ours am: 0d7fa3c08f -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: I5c3e7d8e16324ab0003419c93396ffffae77c52a

...

This commit is contained in:

Automerger Merge Worker

2020-07-21 20:26:42 +00:00

parent d697debafb 0d7fa3c08f

commit 4855cdd6a4

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