tree e4075415fcf2f23ddee6be165d2b83fd310b53a1
parent c6b5dd4897bf95967b27b36cb517f0f209290be2
parent fdce862c9557bda416661d3ec42565ce5f950bd0
author Geoff Mendal <mendal@google.com> 1456154167 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456154169 +0000

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