diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-05-04 10:02:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-04 10:02:16 -0700 |
| commit | 8fdedfd3d341345e6121d6734c55dd7ee4976cbf (patch) | |
| tree | 89893129a55cf79038adfe36925ed61c6a36a08b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2d479be9c6f40de79c535fe5f5b9d69515838d5a (diff) | |
| parent | 9f7aa4c66598b3c929a442a9dd6cee814a700435 (diff) | |
am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
* commit 'f13eb8301f4704179938e374129f2943c9c38d5f':
Add auto-restore timeout for secondary networks.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions