Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3520f7482a -s ours am: a780c8afe5 -s ours am: 4648c36c57 -s ours am: 665f358efc -s ours am: d8e1470bd5 -s ours am: a938afe5d2 -s ours" into sc-qpr1-dev-plus-aosp am: 86dddcca46 -s ours am: 207fb83c79 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15875815 Change-Id: Ib6d47bd9cb9f121f512487b4b8b513e1435db77c
This commit is contained in: