tree 1a4da82df5efd8f368c3909bad8f06b710a90766
parent 8c917322a7c1b59799629b7d19c4f072d0180ddc
parent 05ab7a37a4b67f7e620f5cc349c256a03f1dbb5d
author Bill Yi <byi@google.com> 1480962935 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1480962938 +0000

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