diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-12 18:16:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-12 18:16:32 -0700 |
| commit | 064bf5ef4ae0df781e3396feffbd9b4c7ee4ca95 (patch) | |
| tree | 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1ad67dec163c6108b9a58f3ba41330bcc5f45566 (diff) | |
| parent | f6ecec5451fb27f84c9692d1fa46d2eb6cc9b433 (diff) | |
am 40e3af61: am 8abc9e9b: Merge "Don\'t play a sound if a volume key press is canceled." into gingerbread
Merge commit '40e3af61dcbf7e49979a67410f37c4b4523a0bd6'
* commit '40e3af61dcbf7e49979a67410f37c4b4523a0bd6':
Don't play a sound if a volume key press is canceled.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions