tree 62c2ce4f1f892cdb1750e703cafc1d51dc94d12e
parent 09be7e61f52612169f53e40d6df9913ff49ddc1b
parent 7c4db03c330ce3cb0b5deebf01afa09b3af6859d
author Baligh Uddin <baligh@google.com> 1352529847 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352529847 -0800

am 7c4db03c: (-s ours) am 65f120d9: Import translations. DO NOT MERGE

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