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