tree 933bc237c5acb2827b23ce54587b93e0ca0904b3
parent 9f24c67853785c7b5ef08815e7e51147f561aa86
parent aa391a0ef087bb58fa24361000be74d9dc51548a
author Geoff Mendal <mendal@google.com> 1455118850 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1455118851 +0000

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