tree b0a04aa9fbd00a24830b220788899de871dbb22e
parent 9cc8df0cdfbd7f2baf98b2719c1ef09f9a3c8e87
parent 7a02fa66b76af706e1a1683b17b46d984d8544d5
author Baligh Uddin <baligh@google.com> 1412095409 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412095409 +0000

am 7a02fa66: (-s ours) am 780660b9: (-s ours) Import translations. DO NOT MERGE

* commit '7a02fa66b76af706e1a1683b17b46d984d8544d5':
  Import translations. DO NOT MERGE