tree a12ea38a2e20436aede215c52ff64b4964a074fe
parent e1219bfbcc9206e8867473e7359e5eddb52201b6
parent 04a2ed43f96107703c85271edd87c856713d95e7
author Bill Yi <byi@google.com> 1508219027 +0000
committer android-build-merger <android-build-merger@google.com> 1508219027 +0000

Import translations. DO NOT MERGE am: d51baf20ba  -s ours
am: 04a2ed43f9  -s ours

Change-Id: I9739bc7ac17230d1298399540df04078434fd0f5