am 66b0343e: am a8d9291d: Merge "Various battery info things:" into gingerbread

Merge commit '66b0343e9e32203cdd39b854852cf575ca2fcd6b'

* commit '66b0343e9e32203cdd39b854852cf575ca2fcd6b':
  Various battery info things: