tree c5d0c13112779f3abee8526efc37cf0350e4c36c
parent 5e04bbc7613da127ad830c51113d161cef4c3296
parent a7ad3f6c71ad6701fcaa6ecf75452563addb0dd0
author Doug Zongker <dougz@android.com> 1258681539 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258681539 -0800

am a7ad3f6c: am 50a21f4d: add reboot() method to PowerManager

Merge commit 'a7ad3f6c71ad6701fcaa6ecf75452563addb0dd0'

* commit 'a7ad3f6c71ad6701fcaa6ecf75452563addb0dd0':
  add reboot() method to PowerManager