[automerger skipped] Import translations. DO NOT MERGE am: 23e86df342 -s ours
am: 6fd15de6f6 -s ours
am skip reason: subject contains skip directive
Change-Id: I473acfaa712493f1968f3a34481f45b4f00718d1
This commit is contained in: