tree 62d048de544c7b3d290d1914f836253523b76c79
parent 0ec53f479bfd40a56bf20924cb9debf4cea829db
parent 91c7f77dcfe3c77ff2a7a65bad1747d2db41bdc1
author Baligh Uddin <baligh@google.com> 1383317797 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383317797 -0700

am 91c7f77d: (-s ours) am 29cff2d2: (-s ours) Import translations. DO NOT MERGE

* commit '91c7f77dcfe3c77ff2a7a65bad1747d2db41bdc1':
  Import translations. DO NOT MERGE