tree ad24eec9b42c703e9da43e0d2f767940fb173b8b
parent 23aadfd1c83e08b6723d4cb9357b2908cc464a86
parent 3db0f18cd4cabfc1c1b67fe750e491b00c8055d8
author Eric Fischer <enf@google.com> 1337973296 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337973296 -0700

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