[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e
-s ours am: 24c843fb30
-s ours am: 3648275e0e
-s ours am: a8e2e5d101
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517274 Change-Id: I7181ab2d8755321155588e68f93699aded99d05f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: