diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-22 06:01:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-22 06:01:29 -0700 |
| commit | 2754b4bde824bfbdc483ad627aaaea87971b053a (patch) | |
| tree | 191308eb508602b901248ed664e5ea257320742a /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1272c8b76b91103648dda7a8ac30f3f14e16782d (diff) | |
| parent | d4d3f36f4c25b41f4253eadd5e67035fe220cad3 (diff) | |
am d4d3f36f: am 1257d330: Merge "Clean up pending sessions on incoming call in SipService" into gingerbread
Merge commit 'd4d3f36f4c25b41f4253eadd5e67035fe220cad3'
* commit 'd4d3f36f4c25b41f4253eadd5e67035fe220cad3':
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