am 79ac8770: Merge change 4834 into donut
am 79ac8770: Merge change 4834 into donut

Merge commit '79ac87704d2e38afb06356704e4b52c739237f40'

* commit '79ac87704d2e38afb06356704e4b52c739237f40':
  Fix a bug where wrong variable was used for comparison.

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