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