[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15331bfdd2 -s ours am: 45f18d61a0 -s ours am: ad293b1919 -s ours am: 5e302b47b9 -s ours am: fab81009ed -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15873783 Change-Id: I4071f3b216dc6e96c0da0ee3915f688e35b91e8f
This commit is contained in: