tree 66eb1aeeb66b919d3db87d60a3eeeaebff5b52cb
parent 7677997aa4c62e349b5346bfbc9956c95577ae64
parent b34702557068ad30be2271cbac510e249da65426
author Baligh Uddin <baligh@google.com> 1413764749 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413764749 +0000

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

* commit 'b34702557068ad30be2271cbac510e249da65426':
  Import translations. DO NOT MERGE