tree 8d0376bb128301928fd19b39918f83ae9c9e57b7
parent 42958b19a7e96fdafaf7aa8e112ae51e78b83ef9
parent 707318795e478a9789860b5006c8ae388eeb9e12
author Baligh Uddin <baligh@google.com> 1349111585 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349111585 -0700

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

* commit '707318795e478a9789860b5006c8ae388eeb9e12':
  Import translations. DO NOT MERGE