[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 96ad83f9ee -s ours am: 41a31994c4 -s ours am: ff44ec800b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15991996 Change-Id: Ic972532a13a302743e89df866acc33f5563f2177
This commit is contained in: