diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-08 15:12:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-08 15:12:55 -0700 |
| commit | c58e9bff10200daaad6d06d57745edcc33314325 (patch) | |
| tree | cb821fc3a56c57ee76beea3d9158e0a8e52adce5 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7c08b70c960a9a6d9e59e854b88c0877fe33dc99 (diff) | |
| parent | db56b9bd39e739474684987b83f386f50596aa5d (diff) | |
am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread
Merge commit 'db56b9bd39e739474684987b83f386f50596aa5d' into gingerbread-plus-aosp
* commit 'db56b9bd39e739474684987b83f386f50596aa5d':
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