diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-20 13:54:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-20 13:54:25 -0700 |
| commit | 91459a151fddb67fa424ab89e5f8440322892c9a (patch) | |
| tree | f5b1799976c978d04a73b8897d6b2152e23a020a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4272310f5fc94735123f6abd6dbaeb13f4670676 (diff) | |
| parent | 2a9c6d09136a3d89b14cbfaaf9dcb58edc84cf7b (diff) | |
am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread
Merge commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184' into gingerbread-plus-aosp
* commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184':
Remove ringtone API from SipAudioCall.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions