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

am: 93be386157  -s ours

Change-Id: I17b2921206c951c03740283a81ace5e085db0424
This commit is contained in:
Bill Yi 2017-10-20 15:30:30 +00:00 committed by android-build-merger
commit 086c57be76

Diff content is not available