tree 6e57875846903714d31b6511f30e7bce77d0d896
parent 4cc533dd1c946664df1cd7386f60d37fd16c2668
parent 6ce4a326efae4abb108e19899f4d7776abc362da
author Doug Zongker <dougz@android.com> 1299657215 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299657215 -0800

am 6ce4a326: don\'t reboot for inactivity if USB is connected

* commit '6ce4a326efae4abb108e19899f4d7776abc362da':
  don't reboot for inactivity if USB is connected