diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-04-20 16:00:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-20 16:00:58 -0700 |
| commit | ac4c0581c5fb226f72ff5c0588345e7eed7c7f5e (patch) | |
| tree | b50f68d7ba3a181e220d06ca20576b04a32772c4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c0c5f705e13a5e639b38e2b02371b05fda56ea26 (diff) | |
| parent | d1f799f11c57c1eb2ee66db9ae4e04601f9b76cd (diff) | |
am fe8620ac: Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clients cannot re
Merge commit 'fe8620ac42c9b61ab47fab83caa34816e6404ee5' into froyo-plus-aosp
* commit 'fe8620ac42c9b61ab47fab83caa34816e6404ee5':
Update AudioService to reflect phone state changes with AudioFocus.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions