am 666b998b: am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev

* commit '666b998b67fe7bb6fc11dd6d683a18b5690afd39':
  Detect wedged ContentProviders, treat as ANR.
tree: 77d63fcb6b8757029c7c4bbfe03ff37384b70b67
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml