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