tree 14824b6b6b6148d406427606df5e486afa0bb3a5
parent 15f08d6515f61661a172a49b8fe6f86221035b7f
parent ff1cf37af66f9d9f7a81ce7251baa643fc5775ce
author Eric Fischer <enf@google.com> 1335476318 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335476318 -0700

Merge "Import translations. DO NOT MERGE"