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 | f6354aca3a4d0571a66747d9cdc247a1d411d660 (patch) | |
| tree | d3d277f3531161cbe93d6e16234e7a5a06a809ff /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 04e5a1cba9671d2d6b07dbb9bc3b8d18fa610321 (diff) | |
| parent | 912e0f7d9e377905ded6af3d01c52952e4fead2b (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