| commit | 6f9a673e30838c549d3fe56e56a30a36ab73e1cd | [log] [tgz] |
|---|---|---|
| author | Than McIntosh <thanm@google.com> | Thu Jun 11 17:14:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 11 17:14:17 2015 +0000 |
| tree | 164fa8422760097441965d704421e0b655fd45f1 | |
| parent | 553768a9c61b39a21e75c2daea2265b6a7407c13 [diff] | |
| parent | ad47569766763512d45e51fb33483419aaee6f13 [diff] |
am ad475697: Merge "Record device screen state and system load (from /proc/loadavg)." * commit 'ad47569766763512d45e51fb33483419aaee6f13': Record device screen state and system load (from /proc/loadavg).