Merge "Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b415ead18 -s ours" into sc-dev am: a71fe535c8 -s ours am: 1290bbed4f -s ours" into sc-v2-dev-plus-aosp am: 14c26acb61 -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: I3cdc80b74c5a2fc61be4bca5954e97639a0c8932

...

This commit is contained in:

Automerger Merge Worker

2021-07-06 02:36:11 +00:00

parent 36f5e1b22e 14c26acb61

commit 822fb116c9

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