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

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