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