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

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