commit | cedde01622a6798f5c4526ef1227bd906b6e59ef | [log] [tgz] |
---|---|---|
author | Jeff Brown <jeffbrown@google.com> | Tue May 06 20:34:12 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 06 20:34:12 2014 +0000 |
tree | 8b55e807eae7e5e75016bed99f43a923b3793181 | |
parent | 996e269d93d09615e242edcbd7a6218e065aeb7b [diff] | |
parent | a93369a819c9d4cfd4fe7ce3dd519f1c974bce4d [diff] |
am a93369a8: (-s ours) am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev * commit 'a93369a819c9d4cfd4fe7ce3dd519f1c974bce4d': Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)