diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-21 10:56:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 10:56:02 -0700 |
| commit | d19b510c3933d27f87e25c603bf55817ac1c2c6d (patch) | |
| tree | 098417931546946efcd3ae0cd964b2d743dc5d89 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 41c6cc8af660d70f33bdfbf974e8a443ef0c9f22 (diff) | |
| parent | 31251614b9c73adf851f04210e5b7efdf177b040 (diff) | |
am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Merge commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d'
* commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d':
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