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

am: c228036f0a  -s ours

Change-Id: Ia9551bd60a73a4eb1286931505183a3e25d29d29
This commit is contained in:
Bill Yi 2016-06-17 00:04:08 +00:00 committed by android-build-merger
commit db31f709f1

Diff content is not available