diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-12 18:13:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-12 18:13:47 -0700 |
| commit | f6ecec5451fb27f84c9692d1fa46d2eb6cc9b433 (patch) | |
| tree | 1664382aa17eb82db6f397d535fff7bd57ac2055 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8346872699c8fc9dc44698fc52d73148e30a5427 (diff) | |
| parent | 77b34573ee2328b41f378cbcf819004860b41ba2 (diff) | |
am 8abc9e9b: Merge "Don\'t play a sound if a volume key press is canceled." into gingerbread
Merge commit '8abc9e9b9917760a63cc38a030e64f207aeef86d' into gingerbread-plus-aosp
* commit '8abc9e9b9917760a63cc38a030e64f207aeef86d':
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