[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 763b15231f -s ours am: 6cb60f0b37 -s ours am: d34e9c4a90 -s ours am: 93b91cce2f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398 Change-Id: I23b5603965129f42b2219e0f2cdec0b91d58369a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: