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