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