commit | 6884db1c4f0091a1fab5615f73371684c4501b24 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Oct 07 18:34:26 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 07 18:34:26 2020 +0000 |
tree | 10a14530514c9dc6b79ac02f620fb206e9893caf | |
parent | c70687517a36dd7eb1796069e29c42981bbb1220 [diff] | |
parent | ad20bb487578b8c9ede3c406bb40ee43b764f7dc [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f0313f1328 -s ours am: ad20bb4875 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12779297 Change-Id: I5d4f16f1ac17690f33d46e58bd994018c6a37635