OSDN Git Service

am c2a47691: am 631c0bde: am 2264a643: Merge "Move lockscreen to using haptic feedbac...
authorJeff Sharkey <jsharkey@android.com>
Thu, 11 Oct 2012 00:23:04 +0000 (17:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Oct 2012 00:23:04 +0000 (17:23 -0700)
commit5a317d7e3e1681ba1b96c1e4bdf7d443fe03ecd1
tree84fbcd355b2cd971b62838e721e110fa9cb5d25b
parent6f5f824cd1aedf01c5e7171a5f28d04dac407a42
parentc2a4769197a520e36d2cfe6911f669ee1a9bb63c
am c2a47691: am 631c0bde: am 2264a643: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev

* commit 'c2a4769197a520e36d2cfe6911f669ee1a9bb63c':
  Move lockscreen to using haptic feedback setting.