tree 2066df7bed9d2445d2bdcd3fb024fd273ca33ecf
parent 094eff2f8b4fb15ae88073c02cdd27824fbcc217
parent 9f6ac49dd23150a81b985764c9cede3e28c12309
author Adrian Roos <roosa@google.com> 1436904081 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436904081 +0000

am 9f6ac49d: am 49d176e6: am 31e138db: Merge "Show charging speed on Keyguard" into mnc-dr-dev

* commit '9f6ac49dd23150a81b985764c9cede3e28c12309':
  Show charging speed on Keyguard