diff options
| author | Dan Egnor <egnor@google.com> | 2010-04-06 22:03:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-06 22:03:04 -0700 |
| commit | bd28a683b1933ce80b7cb67f752bf007e9ebd460 (patch) | |
| tree | cdbf9768a271b0e0c930e042bbf7359082ffb896 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 68095b935d4d2331a081b5ef14bc8e4d4fb57ac3 (diff) | |
| parent | 86acf64c14cec6624ed2af4ee298aad80520944b (diff) | |
am 9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo
Merge commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8' into froyo-plus-aosp
* commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8':
Comment-only change to clarify the role and use of IntentService
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions