[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 554eef1388 -s ours am: 17cdad7b22 -s ours am: 48891c07ff -s ours am: a60aea0ed0 -s ours am: f90853d75f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18746394 Change-Id: I93e25dd954ac94f056c1768e61b9b664cb1eb75d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: