Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 979367bc12 -s ours am: ec80d61144 -s ours" into sc-dev-plus-aosp am: b49d6b5e64 -s ours am: a0be3bce66 -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: I6f2c41656e3bc60ecc5361f8864a05e20c83ea70

...

This commit is contained in:

Automerger Merge Worker

2021-07-04 20:56:32 +00:00

parent c47dbf6129 a0be3bce66

commit 6bd10151af

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