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

am: 2ebc49de87  -s ours

Change-Id: I56a11d5e529d87205c1be5a18bd6af78e695ab6a
This commit is contained in:
Bill Yi 2016-06-17 04:49:39 +00:00 committed by android-build-merger
commit 721e972633

Diff content is not available