tree 6eeedafc6f4663960bf4024c3cb4004cd17f080e
parent 91514c375d1c2b056c06e331935742b4e8084b1e
parent aee10c80abb0c58098ee500aacb134b8ff1d2f86
author Bill Yi <byi@google.com> 1496250144 +0000
committer android-build-merger <android-build-merger@google.com> 1496250144 +0000

Import translations. DO NOT MERGE am: 8b6ea60fac  -s ours
am: aee10c80ab  -s ours

Change-Id: I282b55adf291ceea96cb988c1d6df80fcc8b08e3