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