diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-15 13:06:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 13:06:30 -0700 |
| commit | 6393deaf98fa2895f8c2ae5081fbba0fe75ae80b (patch) | |
| tree | 14932a87458bbc9f1488a977ea1a1a31539b22af /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 01a692c03971a825cc45d50c4f52093fe336ac51 (diff) | |
| parent | 8b419496dfd39c71ca0e569841793de88b3de968 (diff) | |
am 968735e5: Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread
Merge commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3' into gingerbread-plus-aosp
* commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3':
Fixing the NPE in SipPhone
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions