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

am: 8181498163  -s ours

Change-Id: Ib6c69380847dd5bd89e62495c00abe78227d632d
This commit is contained in:
Bill Yi 2016-06-30 22:01:37 +00:00 committed by android-build-merger
commit 9b14186afe

Diff content is not available