tree b6938f894d7eb0487ff3ab3a71bec55a334d819a
parent 43f22e4a251b70e7757958c66984a26a0498a95a
parent da15b4dc830b4de3ffa4544bd9f4f7bfe5f58d95
author Bill Yi <byi@google.com> 1465487802 +0000
committer android-build-merger <android-build-merger@google.com> 1465487802 +0000

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

Change-Id: Ie6a00b85ea8d762f91a252441b88bceecc8bcd49