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)
commit0325b1324b86d6668a2a755e930e605f4b63dd3a
tree61016dd1f6116ff2f0547143695f0e022e29c61c
parentb39ca7fa47de1a8211cf810d531da73a15754b15
parentddf77e14e5d6a5b8aa61c0a9f82c099468129df7
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
am: ddf77e14e5  -s ours

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