commit | 9a474ea6e4fcafdadae650d3705f321805c17d93 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 02 18:34:40 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 18:34:40 2020 +0000 |
tree | 997b751e9eb67e939becaecd600511889d158274 | |
parent | 7d16f97c97c8abaaeb999b813f8ee163102f23c2 [diff] | |
parent | 444c85610750ba887635111ee83ed54d9901060b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3 -s ours am: 444c856107 -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: I0a69909d3fdef7b4d95d74f1958ef76ae6e5003e