am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo

Merge commit '28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp

* commit '28a92b2e76a13c18dc23e5239717b122a174182f':
  Fix a Javadoc to clarify when setAudioStreamType() should be called.