Merge commit 'bdcd30acb3a1ce617f67becd69a7c5bc1037c428' into eclair-mr2-plus-aosp * commit 'bdcd30acb3a1ce617f67becd69a7c5bc1037c428': Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43
Merge commit 'bdcd30acb3a1ce617f67becd69a7c5bc1037c428' into eclair-mr2-plus-aosp * commit 'bdcd30acb3a1ce617f67becd69a7c5bc1037c428': Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43