commit | 89be4267d0a23ca258af607291bc4f905f963185 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 10 16:29:39 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 16:29:39 2012 -0700 |
tree | c0a876a338cce9cd28539558304d544e8b477151 | |
parent | ed6059a292330a1d26953a485da6e0c2ede60ba7 [diff] | |
parent | 03bd101b887d9741230ac6a7d296d90436020b8c [diff] |
am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev * commit '03bd101b887d9741230ac6a7d296d90436020b8c': Move lockscreen to using haptic feedback setting.