diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-01-28 09:22:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-28 09:22:01 -0800 |
| commit | c86824de5e3d95e2154baa37d57fec6d42326aad (patch) | |
| tree | e39a0d495d57e3099393dfe124ca6f740460889f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 53d95ddd3ef76e6eb7992c2250aa74dcb0c77a5d (diff) | |
| parent | 2b1e60768214fbacaac9b654d61e4e13e1f3cbcb (diff) | |
am 07a8778b: Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '07a8778b560ce8d46bcf5aad012be575f3a90500':
Update networktype before sending state change.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions