OSDN Git Service

am 0bf59479: (-s ours) am 8904f8fa: (-s ours) am 3cbc6cd8: Merge "Import translations...
authorBaligh Uddin <baligh@google.com>
Tue, 30 Oct 2012 17:14:37 +0000 (10:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Oct 2012 17:14:37 +0000 (10:14 -0700)
commitf57407925c52c8b5f63b78a210cb7fd9a92c56ee
treee5d34148aad02db2c791e95ad5ddd86a48707034
parentecb080b38b0186da83d16ef265f1bc1c58685acf
parent0bf59479b4e34ebfd03b168927575cfefa3275b8
am 0bf59479: (-s ours) am 8904f8fa: (-s ours) am 3cbc6cd8: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '0bf59479b4e34ebfd03b168927575cfefa3275b8':
  Import translations. DO NOT MERGE