diff options
| author | Bjorn Bringert <bringert@android.com> | 2010-04-06 09:00:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-06 09:00:51 -0700 |
| commit | acf50fa966ef72ff7cb626d5f349edfff5022089 (patch) | |
| tree | ec1cb255bbdad108ce60ceb7267e305a4f0f34e6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3689034a24b989d431b0bcc707c2310b0754d77d (diff) | |
| parent | caefc0739c942c3a32c21f7fc30e4fc75d934f41 (diff) | |
am 16419aca: am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo
Merge commit '16419aca40e9d570eef4f51133ba1b734d3012c0' into kraken
* commit '16419aca40e9d570eef4f51133ba1b734d3012c0':
Guard against NPE in SearchManagerService
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions