[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766
-s ours am: 6a0935a34f
-s ours am: 0e084ba633
-s ours am: 3a1955f7e4
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019 Change-Id: Ifb53c74f88cdadd09f7ce830ad93b3be547b96ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: