diff options
| author | Bjorn Bringert <bringert@android.com> | 2010-05-07 03:43:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-07 03:43:48 -0700 |
| commit | e349c382b8766b0debad24d45ec82b53e5ef9a28 (patch) | |
| tree | a338e707a1837b40f2a00b82b44be4d9b446e457 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7dd2bb84128d9026f045999b94644fcda772de52 (diff) | |
| parent | 453193cf4af924c0fec1db70d922afa87c50d675 (diff) | |
am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb' into kraken
* commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb':
Fixing: RecognitionService logcat spam "cancel called..."
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions