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

am: ff25e24e6e  -s ours

Change-Id: Idc0df1c8e29b307f4c3b4e6b8a1c051d22e75db0
This commit is contained in:
Bill Yi 2016-06-17 00:04:07 +00:00 committed by android-build-merger
commit 982b7c6e75

Diff content is not available