diff options
| author | Dan Egnor <egnor@google.com> | 2010-04-06 22:06:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-06 22:06:48 -0700 |
| commit | 7d3a3e932d036ae87327fa2f3d7152f5a9782e05 (patch) | |
| tree | ec1cb255bbdad108ce60ceb7267e305a4f0f34e6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 685c7696b7bce8952ce3ef8fd67c00354aab0d2e (diff) | |
| parent | bd28a683b1933ce80b7cb67f752bf007e9ebd460 (diff) | |
am aa94842c: am 9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo
Merge commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51' into kraken
* commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51':
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