summaryrefslogtreecommitdiffstats
path: root/include/ui/PowerManager.h
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-03-15 10:42:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-15 10:42:06 -0700
commitf38d253ccd79e645baf3c12eed35fc98a4ffa858 (patch)
tree0b73dd88c2f1869d0464c257d10e762b4b6e2467 /include/ui/PowerManager.h
parent005de48cfbce35d1f2914ed7d975fa1ed6e702ba (diff)
parentceb7cb1460484eda1a3cb9cd271d7caf3a3dcbd1 (diff)
downloadframeworks_base-f38d253ccd79e645baf3c12eed35fc98a4ffa858.zip
frameworks_base-f38d253ccd79e645baf3c12eed35fc98a4ffa858.tar.gz
frameworks_base-f38d253ccd79e645baf3c12eed35fc98a4ffa858.tar.bz2
am ceb7cb14: am 02805a40: Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1
* commit 'ceb7cb1460484eda1a3cb9cd271d7caf3a3dcbd1': ANativeWindow: add query for the concrete type.
Diffstat (limited to 'include/ui/PowerManager.h')
0 files changed, 0 insertions, 0 deletions