tree 67257a1d83a1beb0d7e11351433b78c0a26805f4
parent 81f82d29ed3c93704c4fa0cbfeb48a675b71c349
parent 73f6e3f583b1ff2948fd82e68a3f813750165b14
author Baligh Uddin <baligh@google.com> 1355199617 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355199617 -0800

am 73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '73f6e3f583b1ff2948fd82e68a3f813750165b14':
  Import translations. DO NOT MERGE