Merge change Ic9f6bf94 into eclair

* changes:
  Add a test app that will drain the battery.  NOT IN BUILD.