commit | 5d975703e17d5d24576830dface8ce6db2e34bb0 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 02 17:57:25 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 02 17:57:25 2020 +0000 |
tree | 688ceba875f1b4d2a9611c3c25ec35b8a625592a | |
parent | ac118415daa9231f2bad3b4050bd142edfdcfbd5 [diff] | |
parent | 2461dfd8a0066b41d8a6af702eb72c6ed1af0356 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a -s ours am: edb75a2eec -s ours am: 4a3e39cb13 -s ours am: 2461dfd8a0 -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: I9b2422569158b26dc9e20ead51e4a42b466e453a