tree f8a3d61a22b7846070d3330be4ad6363f3f9c445
parent bfbf22b029f23972799a9ba6cc3869aac1c4f5b5
parent 1211d70d0b2fb8109ede06747cd413fa136f838e
author Geoff Mendal <mendal@google.com> 1456760065 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456760066 +0000

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