summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/power/PowerManagerService.java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2014-03-11 23:26:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-11 23:26:38 +0000
commit898d6d964cb3b650b5c9bed2276310547e5455e0 (patch)
tree3983de2ac224e2f1750b033be8472bcf6657f151 /services/java/com/android/server/power/PowerManagerService.java
parent9af19bee1c7da8d2e8bc6e40c6e9c1e28e0640c6 (diff)
parent7f2c9e9420252a493b7399639f794c8a963444e5 (diff)
downloadframeworks_base-898d6d964cb3b650b5c9bed2276310547e5455e0.zip
frameworks_base-898d6d964cb3b650b5c9bed2276310547e5455e0.tar.gz
frameworks_base-898d6d964cb3b650b5c9bed2276310547e5455e0.tar.bz2
am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '7f2c9e9420252a493b7399639f794c8a963444e5': Add a config override for ViewConfiguration#hasPermanentMenuKey
Diffstat (limited to 'services/java/com/android/server/power/PowerManagerService.java')
0 files changed, 0 insertions, 0 deletions