tree 3713c1b6fd7e6e17791e005f6eb54048cae5a012
parent 1947d9f55e8b5966a473dbc7a75967325e32ae8b
parent 09e34e989ca7680888217ad4ad13a3296cc1eb94
author Geoff Mendal <mendal@google.com> 1433944721 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433944742 +0000

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