[automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours
am: 7903044b2b -s ours
am skip reason: subject contains skip directive
Change-Id: Ifdcebac440af1d2a114637d9ddbc32661ef4f46a
This commit is contained in: