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

am: 464f60e489  -s ours

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

Diff content is not available