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