commit | 055897ac9a569ffb1e21ef70c837336cfd679413 | [log] [tgz] |
---|---|---|
author | Jean-Michel Trivi <jmtrivi@google.com> | Fri Apr 02 09:16:05 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 02 09:16:05 2010 -0700 |
tree | 278a322bdb9dfda60a9885a2e99c8e2d1cf28a0a | |
parent | 4cd79e3c5ca17f2c45dde0938f8208c87eeee943 [diff] | |
parent | 28525488fb5769fb119b01db17dc0ed305f0e7b0 [diff] |
am 28525488: am 9ab05fff: 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 Merge commit '28525488fb5769fb119b01db17dc0ed305f0e7b0' into kraken * commit '28525488fb5769fb119b01db17dc0ed305f0e7b0': Fix bug 2565463 Ensure an object cannot appear twice in the