tree 915abd829a7d2620bafd92387cdbf7ddffd44326
parent 36c4adf9f713602722ebd99c4b44137f6240fca7
parent 666b998b67fe7bb6fc11dd6d683a18b5690afd39
author Jeff Sharkey <jsharkey@android.com> 1380731714 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380731714 -0700

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

* commit '666b998b67fe7bb6fc11dd6d683a18b5690afd39':
  Detect wedged ContentProviders, treat as ANR.