[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3366fd4bdd -s ours am: d49b6c3c61 -s ours am: 71cac2fa3c -s ours am: 9f92ed9f52 -s ours am: 39b032312b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15693273 Change-Id: I16a72c023ce5b7a9e3f7068b139e2cb172b8b688
This commit is contained in: