tree 2ddd1234564276c1392d72b840acb3844a43183b
parent 4335e11b3c1f55eee79afadb630060482deead13
parent f34f2f9d925155ad020afb9b947d9c29521f7cdd
author Bill Yi <byi@google.com> 1493987259 +0000
committer android-build-merger <android-build-merger@google.com> 1493987259 +0000

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

Change-Id: Ice4b719df20796120d7d44b09d7aad31f445a294