[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759
-s ours am: 95d0cc1766
-s ours am: 6ac3ac9e63
-s ours am: 14389d1638
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517272 Change-Id: Ib123de5e001dd71af61e33d4d4a6087d95b2c246 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: