am 17d262f2: Merge change I69220990 into eclair
am 17d262f2: Merge change I69220990 into eclair

Merge commit '17d262f2322258ab88ba2b012c10df37d207ba99' into eclair-plus-aosp

* commit '17d262f2322258ab88ba2b012c10df37d207ba99':
  Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"

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