tree 5babd8338e5cd14b2492ab6013943919e004ae43
parent d63cdafebd6129aa796a8996acc75fb5a6026db6
parent 0e7850d774e0c9f8a0f26d180bcdba25be95ea51
author Baligh Uddin <baligh@google.com> 1414775255 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414775255 +0000

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

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