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

am: 0b82b53b82  -s ours

Change-Id: I6191fe0a0b48508149189c391f106d9783f8ffd2
This commit is contained in:
Bill Yi 2016-06-17 04:30:42 +00:00 committed by android-build-merger
commit 66299ffce0

Diff content is not available