[automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: acd8a48b6c -s ours am: 0a4c821751 -s ours
am: 050918c710 -s ours
am skip reason: subject contains skip directive
Change-Id: I18edde858159ab2015f1bcee0c7042161cd1b50f
This commit is contained in: