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)
commitddf77e14e5d6a5b8aa61c0a9f82c099468129df7
treef7642c577566ed7c95553465aa5adbdafbfa3a03
parente0c9dd1b4fbeb2667a58686ab8a71e5cfd070e49
parent2d43dd3c0e49776589cb21bfbf9b3860623d0bfc
Merge "DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events." into cw-e-dev am: 6915d809e8  -s ours
am: 2d43dd3c0e  -s ours

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