summaryrefslogtreecommitdiffstats
path: root/core/java/android/os/LocalPowerManager.java
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2009-11-23 10:40:13 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-23 10:40:13 -0800
commit34c5813e488fd4f044e545f177a20f553580ce6a (patch)
tree3875e16d9a3137a682b1e9bd4997f2353e4e5f24 /core/java/android/os/LocalPowerManager.java
parentcd979d555fbf991bdc59b3521281786e78e809fc (diff)
parent174b726917c12d61f9135a180afc8413d845dc2d (diff)
downloadframeworks_base-34c5813e488fd4f044e545f177a20f553580ce6a.zip
frameworks_base-34c5813e488fd4f044e545f177a20f553580ce6a.tar.gz
frameworks_base-34c5813e488fd4f044e545f177a20f553580ce6a.tar.bz2
am 174b7269: Merge change Id886fb28 into eclair
Merge commit '174b726917c12d61f9135a180afc8413d845dc2d' into eclair-mr2 * commit '174b726917c12d61f9135a180afc8413d845dc2d': Fix deadlock in WindowManagerService.reenableKeyguard()
Diffstat (limited to 'core/java/android/os/LocalPowerManager.java')
0 files changed, 0 insertions, 0 deletions