| commit | b570d42b0fd1866e8fe7727ac3bc0bd77dd7ca30 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Tue May 06 20:38:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 06 20:38:42 2014 +0000 |
| tree | 4c775c405cd5cf3996ef9567ad82e412818ea940 | |
| parent | 5e7cc476f304005b76dc55122bf965c22a63ca49 [diff] | |
| parent | 5179034da12c2cc2444c2ab53bda209fe86aa148 [diff] |
am 04062754: am a93369a8: (-s ours) am 84aaf124: Merge "Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)" into klp-modular-dev * commit '04062754924d7b72b57e33d01aade784701c604c': Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)