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