tree 0058fd1a78994683a244210ed5996745329b84e9
parent 0e7a3277134dbbb2d202ce7d8bc2cd93ef3e8a79
parent 4beae5d6028192f4819159079515f7a85699ca1d
author Baligh Uddin <baligh@google.com> 1410881511 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410881511 +0000

am 4beae5d6: (-s ours) Import translations. DO NOT MERGE

* commit '4beae5d6028192f4819159079515f7a85699ca1d':
  Import translations. DO NOT MERGE