am 822d8f67: am bdcd30ac: am dfc066e7: Merge change I5ad37324 into eclair
am 822d8f67: am bdcd30ac: am dfc066e7: Merge change I5ad37324 into eclair

Merge commit '822d8f67ebcdab61fa513d6d9401476e12143386'

* commit '822d8f67ebcdab61fa513d6d9401476e12143386':
  Fix issue #2262563: 40 ANR reports from com.android.settings in dogfooding sholes running ERD43

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base