tree 37606d47a6c3f8fe2072ea3c4a662f23035a951b
parent d7c28056d3fc462f42b508026154d6d8fee5606b
parent 8d2682829e1c1cfb3ea325e16a62b6c433dafaa2
author Eric Fischer <enf@google.com> 1335816448 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335816448 -0700

Merge "Import translations. DO NOT MERGE" into jb-dev