am 7fb1a891: am ae405d56: Merge "Fix a simple logic mistake." into froyo
am 7fb1a891: am ae405d56: Merge "Fix a simple logic mistake." into froyo

Merge commit '7fb1a89128a87c30441bc839c935f8e1fb993a26' into kraken

* commit '7fb1a89128a87c30441bc839c935f8e1fb993a26':
  Fix a simple logic mistake.

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