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