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