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

* commit '7f60e70e815d381035b141843395830407c198d9':
  Detect wedged ContentProviders, treat as ANR.
tree: db67cbb5478d572d790cf57cd3d4aea5ffa69dc9
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml