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

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