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