tree f31e67d2b8b8fbbb89565c7a3298b5691d86c149
parent 87d8136f89f433f5bf5962c8a32b02250492b316
parent 0f6ffd807c24ce02fe4894005ff804fe6a79df93
author Geoff Mendal <mendal@google.com> 1456154455 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456154457 +0000

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