tree 7b9fcd939dc9e9865edde5adfc34418816d3ca5b
parent 5741c4afc6175c581ff34393efb4f866b3b56628
parent cd1c178395738380f7181721a709116534a7c150
author Bill Yi <byi@google.com> 1479691759 +0000
committer android-build-merger <android-build-merger@google.com> 1479691759 +0000

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

Change-Id: Id47295927524b2c9a4177f9672fb76b6b4a69e68