tree 7d0ac3959a644d36d40a907776ffa6fe8653acaf
parent 80abd51dbcf5869d3ef4ddfc88f538c42697c39e
parent 5df22d03d2e7c6de213d83a58e0af39c42f839ca
author Doug Zongker <dougz@android.com> 1295992567 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295992567 -0800

am 5df22d03: am 5cae445e: make recovery reboot after 2 minutes of no activity

* commit '5df22d03d2e7c6de213d83a58e0af39c42f839ca':
  make recovery reboot after 2 minutes of no activity