[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3b3d93f167 -s ours am: 1522747734 -s ours am: 748d5f91e5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15374537 Change-Id: Ic3ee0ecc18d3bdf98d64287de06626532e75c45b
This commit is contained in: