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:27:43 +0000 (23:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Nov 2015 23:27:43 +0000 (23:27 +0000)
am: ddf77e14e5  -s ours

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


Trivial merge