am 8eb0f348: Merge change I67285c9a into eclair
am 8eb0f348: Merge change I67285c9a into eclair

Merge commit '8eb0f348931c9185ae6a8f49964c904c42b2bb57' into eclair-plus-aosp

* commit '8eb0f348931c9185ae6a8f49964c904c42b2bb57':
  Prevent NPE when doing a fillSpecific layout.

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