tree 05879abb41cd8d7ebc6f18edb5dbe4ea994e1335
parent 2f5e130d4d16eb80e72e492230dec843e1d2c9b2
parent 5b736551cc83499f6ba9bce0b3fccec7e759556a
author Geoff Mendal <mendal@google.com> 1418231749 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418231750 +0000

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev