tree 20d668e854334924a9388d63f8dadabf42e10bab
parent 0fecb5b008c06273fac5b9b6f425476271283b99
parent f12ffe6d762f281cbda56322be83a1da80b707ea
author Amith Yamasani <yamasani@google.com> 1447274729 +0000
committer android-build-merger <android-build-merger@google.com> 1447274729 +0000

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

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