[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 64fd489c13
-s ours am: 118faadcb1
-s ours am: f0b1e40b86
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21606723 Change-Id: I6cb6a78b37741de3e4a1c0fb4dbe90e9590d3ee6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: