tree 36e27a9a20a7fc29e5399f8c352c694587a61301
parent 7032bc1c83b61d75d7a7a4dd83ec41d0c5bf8473
parent f13d963366f094cec1db5dee3d3e22aa7b32f996
author Bill Yi <byi@google.com> 1502907231 +0000
committer android-build-merger <android-build-merger@google.com> 1502907231 +0000

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

Change-Id: Iaa74e788ea224267a60ee0d05573d22fdd27a865