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