tree cb963778923ae1e29c629bdf8d9bf3524aa72dc3
parent 84962061c129b4fe0085e3069e837b68c5542c41
parent 4f8b040d85d14eaef18967ae11493af1b3bdf41d
author Baligh Uddin <baligh@google.com> 1379214697 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379214697 -0700

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

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