diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-08 10:25:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-08 10:25:50 -0700 |
| commit | 026284745bb2f84e96fe132071f48a8cd4c1e715 (patch) | |
| tree | bd170949348f7e4771d70967fc607de44fd90674 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c6a69559cb62bd20166c0c9684e64c60d779da38 (diff) | |
| parent | 88b4bd5f3e8d6e68541eec4a603b1df83291cf1f (diff) | |
am 88b4bd5f: am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
Merge commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f'
* commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f':
CallManager/SipPhone: fix reject a ringing call
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions