tree f7e4affe4b23e49dba29712777c563a15ca20058
parent 757f1135469175d7b7509c2ac88a620b7c189447
parent 52ad690ac30076e39f9898bc42935f4cd54ee77a
author Geoff Mendal <mendal@google.com> 1413221439 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413221440 +0000

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