[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 77b98813c3
-s ours am: 239e6fb371
-s ours am: fced4027ab
-s ours am: 2b767e23c9
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133791 Change-Id: I60fc00ac0181522897e20c1098c8c62058b09be6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: