[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 14a18a67d2 -s ours am: 754b7df9f5 -s ours am: a8bdf9c09a -s ours am: 145609975e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15990748 Change-Id: Ieb1c035394e5079bc9c6fa9833263fd59fadd3c4
This commit is contained in: