tree eec4d04e6bd65f026c68326a201d362263b3fd63
parent 17ef6245bae4156406b9992e01b353eac1eb5502
parent 94744459d28b8b1812f269a410b4ccf1c915270f
author Bill Yi <byi@google.com> 1493986891 +0000
committer android-build-merger <android-build-merger@google.com> 1493986891 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 94744459d2  -s ours

Change-Id: Idaeaf87d8d0c73047656d201b8b5fc37793f30d7