tree d1d5d895f9c055419317216f241e79a32eca45a2
parent 06429fba90a3f5399f02a8cfd9484b11857346f9
parent 7f60e70e815d381035b141843395830407c198d9
author Jeff Sharkey <jsharkey@android.com> 1380732201 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380732201 -0700

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

* commit '7f60e70e815d381035b141843395830407c198d9':
  Detect wedged ContentProviders, treat as ANR.