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 | 74612539d269eefda1fada77e6f70170cddc869a (patch) | |
| tree | a03058e3c762b7d834e344231d1804dad20a1754 /opengl/java/android/opengl/Texture.java | |
| parent | a269d195d41ced934d2153fd81fa69ffe7854740 (diff) | |
| parent | c8170ee2055dcaf993391aacef0e54d87561bfdb (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/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions