tree 2f783cd0e81d23c2bb533f5f7bb2e29f01d8bedd
parent 3210b8b4da3c745420d3010028f2bb7071044262
parent b3d48f18a94c586823462c93fc0f739c83f3db78
author Amith Yamasani <yamasani@google.com> 1447274295 +0000
committer android-build-merger <android-build-merger@google.com> 1447274295 +0000

Merge "Fix system watchdog timeout when reading too many usage events." am: 10b0bae06f
am: b3d48f18a9

* commit 'b3d48f18a94c586823462c93fc0f739c83f3db78':
  Fix system watchdog timeout when reading too many usage events.