tree f1a8cff416c2fc3113d482751b533ffb46852e1a
parent 3a931d028a0c43fe276b0adfdc6b87ac48dd5df3
parent 6289ad5d8f90f1fa4a76d8f2d5cb86c32d111fd5
author Geoff Mendal <mendal@google.com> 1436997385 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436997387 +0000

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