[automerger skipped] Import translations. DO NOT MERGE am: 9909286ace -s ours
am: 3efb76b03b -s ours
am skip reason: subject contains skip directive
Change-Id: I4ce930518f07d80aab035d25bf66094c90c035a2
This commit is contained in: