commit | bf4aa65842cf0bbb95363fd65a88293c76fd3b02 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 02 19:21:57 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 19:21:57 2020 +0000 |
tree | 688ceba875f1b4d2a9611c3c25ec35b8a625592a | |
parent | 727500034b27a59df4fb9ff1621fc1f800faa60c [diff] | |
parent | 983b31be768e497ed80104908192a6bd3c7023b9 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3 -s ours am: 444c856107 -s ours am: 9a474ea6e4 -s ours am: 983b31be76 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510888 Change-Id: I2f156dc19d650514ad91750a8b773d3b2e6664a1