tree afcb1b167f48adb6d377c2ec134a5bdc617f899b
parent 4c152ae488b3ac4dc22482a31728b80e8324104a
parent 1db479ee26d298529b42811598100bb4d3070cea
author Bill Yi <byi@google.com> 1505342913 +0000
committer android-build-merger <android-build-merger@google.com> 1505342913 +0000

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 79bfe12e6b  -s ours
am: 1db479ee26  -s ours

Change-Id: Icba327537143ff1f0753a31123e3f3feb2f862da