diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-04-20 16:04:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-20 16:04:08 -0700 |
| commit | 6a141ea18a019d23e040a6a88144cafc121464c1 (patch) | |
| tree | 2f14c49ad42c2509b99af80a1d82aab722a24308 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b1ab57601acf7f2775c984dcf54d1228ca88a61b (diff) | |
| parent | ac4c0581c5fb226f72ff5c0588345e7eed7c7f5e (diff) | |
am 8dc4c790: 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 clie
Merge commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab' into kraken
* commit '8dc4c790e2c278f8f671c728401ee9458d2d74ab':
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