[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12081073 Change-Id: I1ccbbb5c5c2de481e72808820b1035d35a0bf1f3
This commit is contained in: