tree 48a5ceff01d266f82a3594d703a79806a6ce099e
parent 90a0dace8ec44b591e0d012ec60c42a94acdf54d
parent 93d2e08ef2aff627800c7a915927b481d5541dee
author Bill Yi <byi@google.com> 1467349549 +0000
committer android-build-merger <android-build-merger@google.com> 1467349549 +0000

Import translations. DO NOT MERGE am: 34e2854786  -s ours
am: 93d2e08ef2  -s ours

Change-Id: Icfba2b987aae40dd9f9cebfb7299cc5319d4bc68