tree b2b9103d2e501a4699fca73b18a6ada4bb4dc502
parent ed52179e03e4849202dd03e9471140c7673eb06a
parent 9afea03f1aac5ce5e762f1b81848410a48f26231
author Baligh Uddin <baligh@google.com> 1404682104 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682104 +0000

am 9afea03f: (-s ours) am 3f1de820: (-s ours) am 3f4060a0: (-s ours) am 6072a256: (-s ours) Import translations. DO NOT MERGE

* commit '9afea03f1aac5ce5e762f1b81848410a48f26231':
  Import translations. DO NOT MERGE