diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-15 17:54:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 17:54:01 -0700 |
| commit | 2f87fb14b30e372f701340fa7ff7a9781f1d2144 (patch) | |
| tree | 247e2d025033d62db7eece1eb089109dd36e382f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d63f92b389302f0eda5d33eae892cf99f401253f (diff) | |
| parent | 6393deaf98fa2895f8c2ae5081fbba0fe75ae80b (diff) | |
am 1e563f91: am 968735e5: Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread
Merge commit '1e563f91183d95f5ad2461b7bca864e8f223ef71'
* commit '1e563f91183d95f5ad2461b7bca864e8f223ef71':
Fixing the NPE in SipPhone
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions