Merge commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf' into froyo-plus-aosp * commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf': Fix a simple logic mistake.
Merge commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf' into froyo-plus-aosp * commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf': Fix a simple logic mistake.