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

am: b10be9d131  -s ours

Change-Id: I12b1529c1f983c047e4a1d633ae98a5d0054a65d
This commit is contained in:
Bill Yi 2016-06-30 21:48:49 +00:00 committed by android-build-merger
commit a9bfdd4dd2

Diff content is not available