tree 7c8d11edf30d418cee63b3bbe61f01edb7a0b5df
parent 2d41e5b8f45aaa55717a63ed4bf13202254f354d
parent ad2febc034ed809b6de7cfe787b44d64203e8ca9
author Baligh Uddin <baligh@google.com> 1348610494 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348610494 -0700

am ad2febc0: (-s ours) Import translations. DO NOT MERGE

* commit 'ad2febc034ed809b6de7cfe787b44d64203e8ca9':
  Import translations. DO NOT MERGE