am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640

Merge commit '763e62a831f6cf4e113bff868dab4d48560a3693' into froyo-plus-aosp

* commit '763e62a831f6cf4e113bff868dab4d48560a3693':
  Fix a case introduced by https://android-git.corp.google.com/g/#change,47640

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