tree 65c4fa57d7fab06389e0901b3803a56d9b50c9fd
parent 30de1b96924791419f02863e1f78195d03554f3a
parent 8a7e571e8b29868d6c2371669c0c0e5ecf540151
author Baligh Uddin <baligh@google.com> 1412532889 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412532889 +0000

am 8a7e571e: (-s ours) am 20347611: (-s ours) am fda4d671: (-s ours) Import translations. DO NOT MERGE

* commit '8a7e571e8b29868d6c2371669c0c0e5ecf540151':
  Import translations. DO NOT MERGE