tree 0058fd1a78994683a244210ed5996745329b84e9
parent 33b629c5bdde5d7f3b5d6b6f49456296739d4bcf
parent 3689cdd73be560fca9f7b86c3fd5b39f6a14f776
author Baligh Uddin <baligh@google.com> 1413815895 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413815895 +0000

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

* commit '3689cdd73be560fca9f7b86c3fd5b39f6a14f776':
  Import translations. DO NOT MERGE