tree 114fbd18af676cd735e27e46e5efcf05637ad0a0
parent 4f00fc7d0347b785821e7bb97006c33a860864e4
parent 19fac962d0b00b061152605365440322c7232c71
author Baligh Uddin <baligh@google.com> 1413757424 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413757424 +0000

am 19fac962: (-s ours) am 966b3500: (-s ours) Import translations. DO NOT MERGE

* commit '19fac962d0b00b061152605365440322c7232c71':
  Import translations. DO NOT MERGE