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

am: e6d2b89ce3  -s ours

Change-Id: I1a2ac70bf62670f8f6da2365d2e4bc1fe502c099
This commit is contained in:
Bill Yi 2016-11-21 02:04:34 +00:00 committed by android-build-merger
commit 01d3fde036

Diff content is not available