am 6dd79c1e: am 598169e7: Merge "charger: accomodate minui change" into jb-mr2-dev

* commit '6dd79c1e5a138cb59f05fe7a7c2fd3c78a47e1d4':
  charger: accomodate minui change