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