tree 778055376a2a7549984f419b945bfc5de604b44a
parent 0e17e5bc43373ff9dd8d567f876a26f990ed638e
parent d4114d1aa3664c8cf7a249df46423a6da8a79739
author Baligh Uddin <baligh@google.com> 1346109098 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1346109099 -0700

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