tree 7ab926c1d670417ccd4b8581c9bf49bb78d5d357
parent 572bdaa47484f38cc46a8507231cfec51b3c2e13
parent 0effb652ec7f24a892fe98b16b0eebc6d2e7c12e
author Baligh Uddin <baligh@google.com> 1383797231 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383797231 -0800

am 0effb652: (-s ours) am e0b9a1f7: (-s ours) Import translations. DO NOT MERGE

* commit '0effb652ec7f24a892fe98b16b0eebc6d2e7c12e':
  Import translations. DO NOT MERGE