OSDN Git Service

am 6f9a673e: am ad475697: Merge "Record device screen state and system load (from...
authorThan McIntosh <thanm@google.com>
Thu, 11 Jun 2015 17:26:55 +0000 (17:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jun 2015 17:26:55 +0000 (17:26 +0000)
* commit '6f9a673e30838c549d3fe56e56a30a36ab73e1cd':
  Record device screen state and system load (from /proc/loadavg).


Trivial merge