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