am 0665ae22: Merge change 26939 into eclair
am 0665ae22: Merge change 26939 into eclair

Merge commit '0665ae22aa51183d6ff5fdd0abeee0344306e89d' into eclair-plus-aosp

* commit '0665ae22aa51183d6ff5fdd0abeee0344306e89d':
  Fix 2101425: Camera crashes spontaneously in preview.

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