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

Merge commit '199d7bed1184985cdd1130b4ad1e79163a5c28cc' into eclair-mr2-plus-aosp

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