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