tree 3ddf124b1143ba27d5564dac0bbce9fda2ce6311
parent b481395fd25a4fbe0c05d1e72418f9084749f243
parent 5865b09643ab6ffc72b440cb7afaab46a34273f6
author Adrian Roos <roosa@google.com> 1436904080 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436904080 +0000

am 92874394: Merge "Show charging speed on Keyguard" into mnc-dr-dev

* commit '92874394ce3a9ae19fa431834ced146b0939b364':
  Show charging speed on Keyguard