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 | 0aeef9c1d84e52f5e378126f91cd88ae912da203 (patch) | |
| tree | 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7b082a34b97024cd18ecfc71776f02b16039d4ec (diff) | |
| parent | 292ec505a33ccb94b2ca06ed66d28753e058dfdb (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 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions