tree 2ddd1234564276c1392d72b840acb3844a43183b
parent fd32ed20a94c55c0e89c70809be5faf51ec59afc
parent 0450b46ad4dd558b236ff31f6d576a6722ddb0c1
author Bill Yi <byi@google.com> 1493987646 +0000
committer android-build-merger <android-build-merger@google.com> 1493987646 +0000

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

Change-Id: Ie764ac5d49cba578c92f6164302b39f7c29fae1e