diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-04-14 12:10:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-14 12:10:47 -0700 |
| commit | 8d44aec3da0503217176355d6a42e5c74fc930c4 (patch) | |
| tree | 744fcc6bd303f071d2ff642be0cefb7e8d8247b6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 46e935bf018b4e649473bf9f2bc14eba0a39d3f8 (diff) | |
| parent | bb80da10757f4f0560d4ce14d42fca771e4fd3b8 (diff) | |
am 3e360000: am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo
Merge commit '3e360000fcb1cc60d8786d1340f9a468014c6435' into kraken
* commit '3e360000fcb1cc60d8786d1340f9a468014c6435':
Fix (again) for bug 2558156, update cache encoding correctly
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
