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