diff options
| author | Fred Quintana <fredq@google.com> | 2010-03-31 11:07:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-31 11:07:38 -0700 |
| commit | b0cf8e24c20fafbc7b81cc07475b7e718f50e25a (patch) | |
| tree | 8652850ea1b71670da1d7dd4420a16676827c007 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a9536b912b6b8b87740ca597015db9b1d60f3c89 (diff) | |
| parent | 49e3f3ebcd0c9a538debebbec5f31dab2025bb00 (diff) | |
am fa41ccf1: am 9b9a89a5: Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo
Merge commit 'fa41ccf18cfb9b366c859e09112f8f98797bf152' into kraken
* commit 'fa41ccf18cfb9b366c859e09112f8f98797bf152':
added a cleanspec since ActiveSyncInfo.aidl was removed
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions