diff options
| author | Christopher Tate <ctate@google.com> | 2011-03-04 00:16:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-04 00:16:27 -0800 |
| commit | e26442d9499787c35ce0bd29564b06955b70ca19 (patch) | |
| tree | a14464123bebfff64910d7c44b1759a699a6caa8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ffd51f56387dc00130c545dfcae69dfe512ca86d (diff) | |
| parent | b32d45f9e15db199a2a52d2e008a5e244a2fe79c (diff) | |
am 87ed42d0: Merge "Don\'t spuriously time out restore sessions" into honeycomb-mr1
* commit '87ed42d065653aa30b2d1b8b220b75375cf9af30':
Don't spuriously time out restore sessions
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions