diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2011-01-24 19:41:42 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-24 19:41:42 -0800 |
| commit | c9af508cb2336462f25c1e43bd02c185a15463cb (patch) | |
| tree | c415af2d29a6b3f15a54233ddaf8ab1d6300a5d5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c5da08b788bb9ef7c6421ff460a5bf7306022a12 (diff) | |
| parent | c0cb771cab9659a6e8269e214f88c795e85fda01 (diff) | |
Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* changes:
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions