am d1b73fc1: am 71988c81: am 386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev

* commit 'd1b73fc17ca222cc627c932625efe9c3c1ad3b0c':
  Only show "charging" if the battery is really charging.