Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master

am: 64e0910859  -s ours

Change-Id: I056ff501980e58d5ace3fa6c3aa07c66d20bebe2
main
Bill Yi 2016-06-30 21:54:05 +00:00 committed by android-build-merger
commit 32b5920734

Diff Content Not Available