am 99d20717: Merge change 25265 into eclair
am 99d20717: Merge change 25265 into eclair

Merge commit '99d20717b7fea022052bbb36dde468aaad67d8c7' into eclair-plus-aosp

* commit '99d20717b7fea022052bbb36dde468aaad67d8c7':
  Fix issue 2123668: Class scope typo in AudioFlinger.cpp.

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