am 94980e0f: am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread
am 94980e0f: am 07e1be62: Merge "Fix NPE caused by Change I4df27119." into gingerbread

Merge commit '94980e0f76295de53bd168608d11dba3c39cca9d'

* commit '94980e0f76295de53bd168608d11dba3c39cca9d':
  Fix NPE caused by Change I4df27119.

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