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)
* commit 'c2a4769197a520e36d2cfe6911f669ee1a9bb63c':
  Move lockscreen to using haptic feedback setting.


Trivial merge