summaryrefslogtreecommitdiff
path: root/libs/ui/InputReader.cpp
diff options
context:
space:
mode:
author Joe Onorato <joeo@android.com> 2010-07-27 09:14:42 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-27 09:14:42 -0700
commit385adbdbe35d6b386705edb5474b026975b85b4a (patch)
tree7f918cd2ee1698160c73c94d9229a6c4660c6e7d /libs/ui/InputReader.cpp
parent5cf8fa80463fbc5b90ea5a1a5b548c2f99a46aeb (diff)
parent38723b069c3fa4a9682083a987d5bba317fdc7af (diff)
am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." i
Merge commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917' into gingerbread * commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917': Add a method to let a properly permissioned app directly
Diffstat (limited to 'libs/ui/InputReader.cpp')
0 files changed, 0 insertions, 0 deletions