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

Merge commit '917ec94734056ee44523b88ad2675825376d2c87'

* commit '917ec94734056ee44523b88ad2675825376d2c87':
  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