[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 4cb5412d2b -s ours am: b31e28d926 -s ours am: 949355380d -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15976218 Change-Id: I748fde1bb884ed0b2c06d87949f30c5d13e36a21
This commit is contained in: