commit | af667e87c399491131ac0882d577ae9fac4613b3 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Oct 07 18:48:46 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 07 18:48:46 2020 +0000 |
tree | 180e31b326f7c78fa51ae8263e5d7708f542aa4b | |
parent | d774d729cdf170513d654033001c85ec33dde1c8 [diff] | |
parent | 6884db1c4f0091a1fab5615f73371684c4501b24 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f0313f1328 -s ours am: ad20bb4875 -s ours am: 6884db1c4f -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: Ia191268ed2423cca8410769ceef111d6883d15d4