Merge changes from topic "am-e197cccc8ab8429e9987f2fab3840cf5" into tm-qpr-dev-plus-aosp

Browse Source

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 12a30b9511 -s ours am: 7ab31e744a -s ours am: 6f1d70a7b1 -s ours am: 12dc1d8a4e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d941a36042 -s ours am: 900e78b59d -s ours am: 0dfd96e976 -s ours am: c3dd8bac52 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c8b7a9fe8 -s ours am: 66ad02c375 -s ours am: ad24a2815a -s ours am: dad2842b58 -s ours

...

This commit is contained in:

Automerger Merge Worker

2022-05-18 21:16:15 +00:00

committed by Android (Google) Code Review

parent 6c857fe331 c6fe3b40a7

commit 1db22aef16

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