am 85d33844: am 199d7bed: am bcab01f6: Merge change Ic9f6bf94 into eclair

Merge commit '85d33844a48e62ecae4ca1ad56a8bdbe08fc5693'

* commit '85d33844a48e62ecae4ca1ad56a8bdbe08fc5693':
  Add a test app that will drain the battery.  NOT IN BUILD.