tree f12ad3c7b58575844c792386a636283a1a0a476f
parent 18b818e2dde9eacae9108886bd9b335aabcaaa18
parent c2b08ca6026b046d668abf7e891529ddb641613a
author Bill Yi <byi@google.com> 1501109377 +0000
committer android-build-merger <android-build-merger@google.com> 1501109377 +0000

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

Change-Id: I0c8c1cc35fa6560dd1a40b22544ecd25dc7af0b2