summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/power/DisplayPowerController.java
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-08-16 17:57:44 -0700
committerThe Android Automerger <android-build@android.com>2012-08-16 17:57:44 -0700
commited970b4899338227d944b68c980102c89b9d588a (patch)
treeffef399c08cc65408e31acc80c8f5dcbe0a1b2dc /services/java/com/android/server/power/DisplayPowerController.java
parent8631701bb770f3a4e3b2a139dc282f2244fe86e6 (diff)
parent7534553d4ca09fb8761a16317361529cc304612c (diff)
downloadframeworks_base-ed970b4899338227d944b68c980102c89b9d588a.zip
frameworks_base-ed970b4899338227d944b68c980102c89b9d588a.tar.gz
frameworks_base-ed970b4899338227d944b68c980102c89b9d588a.tar.bz2
merge in jb-mr0-release history after reset to jb-dev
Diffstat (limited to 'services/java/com/android/server/power/DisplayPowerController.java')
0 files changed, 0 insertions, 0 deletions