am 18b10c5d: am 8436ac8e: Merge change 26113 into eclair
am 18b10c5d: am 8436ac8e: Merge change 26113 into eclair

Merge commit '18b10c5d2fe83f4f0ba8e5a36cc0e9d336ffd663'

* commit '18b10c5d2fe83f4f0ba8e5a36cc0e9d336ffd663':
  Added the do nothing test case for the power usage baseline.

bmaupin/android-sms-plus