tree 646fdf87ba9be07d9e04c0e8e2bfbadb5d717446
parent d809912575f2812b3680e1c14541b7663ebcee1e
parent d431416852cad101479f6bfbfc2c8e9b5a7e72c7
author Bill Yi <byi@google.com> 1469075862 +0000
committer android-build-merger <android-build-merger@google.com> 1469075862 +0000

Import translations. DO NOT MERGE
am: d431416852  -s ours

Change-Id: I26f4be3e0e4c60267065f1857806ec7ca18e7b62