OSDN Git Service

am c1d00de0: am 32019e7e: am dab2b29b: Merge "Don\'t suppress haptic feedback on...
authorJeff Brown <jeffbrown@google.com>
Sat, 26 Jul 2014 02:43:51 +0000 (02:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 26 Jul 2014 02:43:51 +0000 (02:43 +0000)
* commit 'c1d00de01b5904a6c6e3e5b6160b0b7e628bd880':
  Don't suppress haptic feedback on keyguard anymore.


Trivial merge