[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8064923875 -s ours am: da4bb792ae -s ours am: cd7cbaf416 -s ours am: 5ad4e5781b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23789021 Change-Id: I2fd559b3f16a9a0c59f5a990baec86285072f2ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: