Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: f7fe0be6a2 -s ours am: 38ef30bc81 -s ours

am: 5fac8299e1  -s ours

Change-Id: I893889cfb4bf3dc924d1007d3470d11c3227fcba
main
Bill Yi 2016-06-30 21:57:47 +00:00 committed by android-build-merger
commit 1be1113161

Diff Content Not Available