[automerger skipped] Import translations. DO NOT MERGE am: 500e7b2b71 -s ours am: 444eac4f4a -s ours
am: 5f968e68c7 -s ours
am skip reason: subject contains skip directive
Change-Id: I5e644b647bb95697d556727ca64dcaab5098b06c
This commit is contained in: