tree e4f2565a79ba6407add12cd66daa56dfe2e1ec36
parent fcd61bb5879f054126ae21521d9ff1d7c86c61e0
parent 7aa7601c09ab5d87cc15a0ed9a8f511d494a4cbc
author Jeff Sharkey <jsharkey@android.com> 1380648555 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1380648556 +0000

Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev