Amith Yamasani b3d48f18a9 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.

2015-11-11 20:30:32 +00:00

..

java/com/android/server/usage

Merge "Fix system watchdog timeout when reading too many usage events."

2015-11-11 20:30:32 +00:00

Android.mk

…