diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-17 17:34:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-17 17:34:05 -0700 |
| commit | a71e074ae4bdcbdef30241a08f23ad9948e69df2 (patch) | |
| tree | f5fc31f01f2df4a86fd2dd4103945252d962c686 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cc930fec2ae3a0e21d795f7474810eb059b631ad (diff) | |
| parent | 99dd37403610a448a29bd9e136a57b9f4ec098e7 (diff) | |
Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions