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

am: 60a9f4ca18  -s ours

Change-Id: I799138b6ee168bb2ce217475ce252921b8925c52
main
Bill Yi 2016-11-21 02:05:24 +00:00 committed by android-build-merger
commit e869c4ef32

Diff Content Not Available