diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-25 17:59:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-25 17:59:49 -0700 |
| commit | 088d370aeab07b6fc00f4f32c0eb57fe08a018a8 (patch) | |
| tree | fa2b133be43a0eb36fb205669b9996b9fa945f1f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 03012a361f22b9a3982095c65f30b53ea4b412c7 (diff) | |
| parent | 205e2b9bd2f9a132bde70fdc47c884ad575440f9 (diff) | |
am 55744530: Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit '55744530222288c79a5e1aa61b65f7f6b2262fab'
* commit '55744530222288c79a5e1aa61b65f7f6b2262fab':
frameworks/base: Handle null from topRunningNonDelayedActivityLocked
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions