tree 2e5f18ad6eb643493ff26e938fb52d9b5bcb2adc
parent 9eb610598eb4513969837639509cd4d3115889d8
parent 19af11865aceabbedcd5711b2c2a61c59df94b23
author Geoff Mendal <mendal@google.com> 1456154313 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456154314 +0000

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