Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1c318f60be -s ours am: d6fa8856e0 -s ours" into sc-v2-dev-plus-aosp am: c270c80020 -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: I885fe50f7fa9c5a666195eb2ab4dc4bbb5d0bcf7

...

This commit is contained in:

Automerger Merge Worker

2021-07-03 04:19:39 +00:00

parent c32da0a93d c270c80020

commit f1e540ed7a

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