OSDN Git Service

am 4e78295a: am ff45c88d: (-s ours) Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Tue, 30 Oct 2012 16:14:52 +0000 (09:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Oct 2012 16:14:52 +0000 (09:14 -0700)
commitb7f97ef3fefc0e73f3e0d34df8939c519a8cb638
tree19373711acc220e52af7020c259635add6ac0fa7
parent513119e8b87142066898189f016cded2e1949b08
parent4e78295ac871a2d3d35b07f18c83868976705097
am 4e78295a: am ff45c88d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '4e78295ac871a2d3d35b07f18c83868976705097':
  Import translations. DO NOT MERGE