diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-21 23:15:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 23:15:20 -0700 |
| commit | d4d3f36f4c25b41f4253eadd5e67035fe220cad3 (patch) | |
| tree | 93c8a43feca21f1e0f7c864d49c3a4971018321e /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | de8635e4c4c9f674b52cb6041380c3ef2812630c (diff) | |
| parent | 1257d330dcfdb87214278c8fc9718ea9fc663df6 (diff) | |
am 1257d330: Merge "Clean up pending sessions on incoming call in SipService" into gingerbread
Merge commit '1257d330dcfdb87214278c8fc9718ea9fc663df6' into gingerbread-plus-aosp
* commit '1257d330dcfdb87214278c8fc9718ea9fc663df6':
Clean up pending sessions on incoming call in SipService
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions