tree 227d0bc3a68d2939001b5a2c179be86a3cb1d058
parent 3e1b4a8aa0023cb20893cfd8ddb10a41c8289ee8
parent b22c174a2e3a2a68e2f1b0119dabeac05e2485ae
author Bill Yi <byi@google.com> 1470132304 +0000
committer android-build-merger <android-build-merger@google.com> 1470132304 +0000

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

Change-Id: Iff89271315880c168fb26e3f4387f0d84eb9b154