tree 3e97de9342e02549a42f7de706763a5431ebe916
parent 8421672e2e883e0cdda00f22e4f0e8c1053312ad
parent 805fc9d373eee514bc70ca52fb66dd51909b2f39
author Jean-Michel Trivi <jmtrivi@google.com> 1270223622 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1270223622 -0700

Merge "Fix bug 2565463 Ensure an object cannot appear twice in the  AudioFocus stack.  Enforce parameter check in AudioManager.requestAudioFocus()  Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo