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

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