Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 464f60e489 -s ours am: ca24f0f89b -s ours

am: 2ecd2c541a  -s ours

Change-Id: Ibc6157f4d2f2375ee89c41bc535d92e33b38bf71
This commit is contained in:
Bill Yi 2016-06-17 18:57:44 +00:00 committed by android-build-merger
commit bee654ede2

Diff content is not available