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

am: ffefbfdb9d  -s ours

Change-Id: Ifd52d59dd56df8a4a756929a2c17b6dc65183f0b
This commit is contained in:
Bill Yi 2016-11-21 02:04:59 +00:00 committed by android-build-merger
commit 630fac14b8

Diff content is not available