Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 2ebc49de87 -s ours am: 721e972633 -s ours

am: 7942663bc6  -s ours

Change-Id: I8fce54b632d060899b812fe6c1571b7bba3fa3fd
This commit is contained in:
Bill Yi 2016-06-17 18:58:24 +00:00 committed by android-build-merger
commit ffad9d5ad0

Diff content is not available