tree 2d588c7b9d823f0f12ee48d253b4d732fbbf4228
parent e3d8faa5ba76f79b112dd8925189455e878e3a66
parent 7d0343ae39c6c675e72992ca2dcac70e0aae22e7
author Geoff Mendal <mendal@google.com> 1444232736 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1444232736 +0000

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