am 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo

Merge commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85' into kraken

* commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85':
  Update javadoc in android.media.AudioManager to not hide the