tree 6c5d95626f3cc28ffaa9d3b78a239ec47437a8c8
parent 43a1cf0f30ef92587b3229e2efc0509aecad73f3
parent eacc3676fc69f8f6278005428f84864a6af5eeab
author Eric Fischer <enf@google.com> 1340305467 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1340305467 -0700

Merge "Import translations. DO NOT MERGE"