tree def4305c9d329175b2e9269ae040af48eb66c447
parent 1abb7b541521d528c8d4f1ec5b79238842e1d155
parent 69bcb056d3eaae8aeef41e5e1b4cadf4c61ee916
author Baligh Uddin <baligh@google.com> 1345502590 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1345502590 -0700

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