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

am: abfce3ccd8  -s ours

Change-Id: I5fe046b806d8189ab067db009b2168d2eceade3b
This commit is contained in:
Bill Yi 2016-11-21 02:03:43 +00:00 committed by android-build-merger
commit 2ceb4450ae

Diff content is not available