tree fc97a0e4f5b0f88d8c25005a955547d93b331e53
parent 5edc6ffda765c51bbd97bd7ae6f1bd2082309dd2
parent 3d2c298035c0d94f1bd590b04b5679f09b09f285
author Adrian Roos <roosa@google.com> 1436904075 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436904075 +0000

am 3d2c2980: am a2231a75: am 9c013a21: Merge "Show charging speed on Keyguard" into mnc-dr-dev

* commit '3d2c298035c0d94f1bd590b04b5679f09b09f285':
  Show charging speed on Keyguard