Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 24d0b735e7 -s ours" into sc-dev am: 461852a5b1 -s ours am: 524d7e4fdf -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14945982 Change-Id: Idfc5d9c5b6c3864d1524bfc9945eb6628ce79843
This commit is contained in: