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

am: f7fe0be6a2  -s ours

Change-Id: Iac6c9a980e0de2e0b4f3a9b10754a9e6a51c0dcb
This commit is contained in:
Bill Yi 2016-06-30 21:48:55 +00:00 committed by android-build-merger
commit 38ef30bc81

Diff content is not available