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