tree fbe54b921796005b989fc1ac1e7337c6b5467871
parent 85964c84f5f5797001dfa8bb69939cc41e16d096
parent ed5a01ec0475cbda078ec38f8b5bb6d90f0597d6
author TreeHugger Robot <treehugger-gerrit@google.com> 1464972671 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464972671 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev