tree 6e57875846903714d31b6511f30e7bce77d0d896
parent 68189f2994690538b6e3bddc3788cb092cbda088
author Doug Zongker <dougz@android.com> 1299615905 -0800
committer Doug Zongker <dougz@android.com> 1299635474 -0800

don't reboot for inactivity if USB is connected

(Cherry-pick back from master.)

Bug: 4071007
Change-Id: I28355c593770df678968185171bdd19dabe7f062