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

am: 634fc5a417  -s ours

Change-Id: Ib385da702d6b94aba349f39b8c84e728573e416b
This commit is contained in:
Bill Yi 2016-11-21 02:05:51 +00:00 committed by android-build-merger
commit efa89be550

Diff Content Not Available