| commit | 9c1a6f402b4f04d2be52dfd9eb37f9181cccb25e | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Mon Oct 01 15:27:27 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 01 15:27:27 2012 -0700 |
| tree | 6da96e00adc71bc76a8613ae9862fc0a60bc5610 | |
| parent | 13176e639cca469268dfb99128b7cdff2d75d098 [diff] | |
| parent | 0fa30848638df704ce40e163652635fbfde5843c [diff] |
am 0fa30848: am 410bc60a: Merge changes I790820b1,I3fcf3619,Ia0d5a156 into jb-mr1-dev * commit '0fa30848638df704ce40e163652635fbfde5843c': Enable hardware acceleration for pointer location overlay. Disable use of twilight mode for auto-brightness. Use new API to override user activity timeout from keyguard.