tree 6a946f534a25274db75051183fd6f40a0fb754c9
parent 3979bd78bf8de36e290e40be629f7f2e3688adac
parent 4fb2afddcd5b0f8aa6f5200951c7bf3c63e3e77c
author Eric Fischer <enf@google.com> 1338317437 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1338317437 -0700

Merge "Import translations. DO NOT MERGE" into jb-ub-mail