commit | 4a3e39cb139603bd18579bc4e157685694eb476d | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 02 16:36:19 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 16:36:19 2020 +0000 |
tree | 997b751e9eb67e939becaecd600511889d158274 | |
parent | 0df917748c9f0045baeb189d4256d9a608ca7686 [diff] | |
parent | edb75a2eec314a94d26b6139e3d83c9c0edc537a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a -s ours am: edb75a2eec -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12510887 Change-Id: I0ec0fe0fa16a7ea6dd2768e16dc5b4c3f8a753f2