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