diff options
author | Xavier Ducrohet <xav@android.com> | 2011-04-06 19:08:02 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-06 19:08:02 -0700 |
commit | efa98a29e01dbb4c700fd6af3353413afcb344d9 (patch) | |
tree | 4c36104f201a9b447fef24553c9aab1f9fa122fb /include/ui/PowerManager.h | |
parent | 9645081cc7f31e1151fedbcd5932a100719e91e4 (diff) | |
parent | 8a18dba48c354fc47056b07ddec8a32fda266b6a (diff) | |
download | frameworks_base-efa98a29e01dbb4c700fd6af3353413afcb344d9.zip frameworks_base-efa98a29e01dbb4c700fd6af3353413afcb344d9.tar.gz frameworks_base-efa98a29e01dbb4c700fd6af3353413afcb344d9.tar.bz2 |
am 8a18dba4: Merge c5aeac7f from honeycomb.
* commit '8a18dba48c354fc47056b07ddec8a32fda266b6a':
Merge c5aeac7f from honeycomb.
Diffstat (limited to 'include/ui/PowerManager.h')
0 files changed, 0 insertions, 0 deletions