tree f7ab604230933e318c51d20413b2a80878ba8223
parent 467804448d6b13e04b4d9bc20fd195baa1f07e90
parent 10b0bae06ffdeb79494ddd1aff19387b56770960
author Amith Yamasani <yamasani@google.com> 1447273832 +0000
committer android-build-merger <android-build-merger@google.com> 1447273832 +0000

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

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