diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2011-06-07 17:53:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-07 17:53:41 -0700 |
| commit | 309ee97168e456a08e1fe4e0df4779860af4cc0a (patch) | |
| tree | 83782c70e05463d7dde8924ea545e9c503398211 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3b462032b04951d21287d6b4780eda8afc3b19ef (diff) | |
| parent | c3c1b199f076989745614e62ac79b2e9ad089f07 (diff) | |
am 6aa152a1: (-s ours) am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread
* commit '6aa152a1df3f77b5838a62194fc196e04d8a5c6a':
Remove discoverable timeout handler. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions