diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-10 19:11:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 19:11:51 -0700 |
| commit | 65bdf4e6342e45d5862e63342f73ada2f8a93f96 (patch) | |
| tree | dbfc386d8778ff7c2791a59a593a655bcd3a3485 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fae998c860e545e35fd3f4a821837409ee9bcb4e (diff) | |
| parent | c58e9bff10200daaad6d06d57745edcc33314325 (diff) | |
am c58e9bff: am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread
Merge commit 'c58e9bff10200daaad6d06d57745edcc33314325'
* commit 'c58e9bff10200daaad6d06d57745edcc33314325':
Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions