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

am: c6a6ef7e38  -s ours

Change-Id: I0217358393d1ac6888cb5ef130a2e20ec3861c8c
This commit is contained in:
Bill Yi 2016-06-17 00:04:07 +00:00 committed by android-build-merger
commit 54f2d178f6

Diff content is not available