commit | 727500034b27a59df4fb9ff1621fc1f800faa60c | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 02 17:57:39 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 17:57:39 2020 +0000 |
tree | 688ceba875f1b4d2a9611c3c25ec35b8a625592a | |
parent | 5d975703e17d5d24576830dface8ce6db2e34bb0 [diff] | |
parent | f87d5f6fc4ece837e907aa28f22facf5b7ee8b57 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631 -s ours am: bc565bd615 -s ours am: 7d16f97c97 -s ours am: f87d5f6fc4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510886 Change-Id: If0c0376268505283e94aacc2cbdc7876fa885381