Merge commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8' into eclair-plus-aosp * commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8': Fix bug 2115258 where the AudioManager javadoc doesn't warn against