tree a29213a148031ce5871998ad94db87e13352c792
parent 98b930ce4ca4258fe1d6e9df0053f6883517a241
parent d7ad7789143be20bbbfd94665281cd7a66115a47
author Baligh Uddin <baligh@google.com> 1351872537 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1351872537 -0700

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