tree 6cfd084ef6cf26e1c14ea7f06cfc6429c6bf879d
parent ee5f14edf9b7874ac731a4c23102794c96cb5adc
parent 3b16104048ee4734bb082a96824081f530d2c039
author Bill Yi <byi@google.com> 1483094775 +0000
committer android-build-merger <android-build-merger@google.com> 1483094775 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 54c62db71b  -s ours
am: 3b16104048  -s ours

Change-Id: I664ce258c449ded2c4cb2f399c08f4a746ea4d00