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

am: 417d745e6d  -s ours

Change-Id: Ic677a160062156ebc625cbd3788781be6a826959
This commit is contained in:
Bill Yi 2016-11-21 02:04:06 +00:00 committed by android-build-merger
commit f642db22e1

Diff content is not available