OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage...
authorJoe LaPenna <jlapenna@google.com>
Thu, 12 Nov 2015 23:21:09 +0000 (23:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Nov 2015 23:21:09 +0000 (23:21 +0000)
am: 2d43dd3c0e  -s ours

* commit '2d43dd3c0e49776589cb21bfbf9b3860623d0bfc':
  DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events.


Trivial merge