tree a701afbd683e4e0bea48aed24e1649265c0c963d
parent 2542fd54ac943002cb7537029404dcc80a6491ac
parent 51e01f9ec058f34a27de7687ceddf4eb0e6b7d9d
author Baligh Uddin <baligh@google.com> 1370100199 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370100199 -0700

am 51e01f9e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '51e01f9ec058f34a27de7687ceddf4eb0e6b7d9d':
  Import translations. DO NOT MERGE