diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-20 13:56:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-20 13:56:59 -0700 |
| commit | 31251614b9c73adf851f04210e5b7efdf177b040 (patch) | |
| tree | f5b1799976c978d04a73b8897d6b2152e23a020a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3124721b391ac472e2accf9d82a635d47757726e (diff) | |
| parent | a6484519451bffa0ff88dbaee3a1a3175dd876ae (diff) | |
am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Merge commit 'baced375ba5f374445c44a2115700d69693794a0' into gingerbread-plus-aosp
* commit 'baced375ba5f374445c44a2115700d69693794a0':
Silently reject a ringing call when another call is dialing/ringing.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions