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:13:01 +0000 (23:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Nov 2015 23:13:01 +0000 (23:13 +0000)
commit2d43dd3c0e49776589cb21bfbf9b3860623d0bfc
tree7112178d0f0dd57f1e91cf4f45504fc6faf0305b
parentd30c141a2dee881fd83e1415a50161def1acf227
parent6915d809e895d29411c0a687bff7fdd391509dc7
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev
am: 6915d809e8  -s ours

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