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

am: f58518ea9c  -s ours

Change-Id: I1980105f452b67b4fd87d331e27452805f72f7c8
This commit is contained in:
Bill Yi 2017-04-03 02:21:09 +00:00 committed by android-build-merger
commit 84e782d4d1

Diff content is not available