diff options
| author | Bjorn Bringert <bringert@android.com> | 2010-04-06 08:57:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-06 08:57:01 -0700 |
| commit | caefc0739c942c3a32c21f7fc30e4fc75d934f41 (patch) | |
| tree | cdbf9768a271b0e0c930e042bbf7359082ffb896 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 28b00ca814d826a051580b08cce2f82cd6eedac1 (diff) | |
| parent | 660557de274226431646f49e848740e4b444e6f0 (diff) | |
am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo
Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp
* commit '7d2511b722808dfc9cadd3f0f49375fcb738df56':
Guard against NPE in SearchManagerService
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions