am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide...
am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
Merge commit '3e90c76c' into froyo-plus-aosp
* commit '3e90c76c':
Update javadoc in android.media.AudioManager to not hide the