diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-03-04 00:15:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-04 00:15:28 -0800 |
| commit | a9e7cd1efe9147b032a8f2e676f00d47a2bd1758 (patch) | |
| tree | a14464123bebfff64910d7c44b1759a699a6caa8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 59156b7a9157a9f820bc01cc1aef2cfa5124dd6e (diff) | |
| parent | 332f4c52046aabc6b167d1b93452f412320fc968 (diff) | |
am 9c8de733: Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1
* commit '9c8de7331475ef6f55449d95d0dfc6dcb425d116':
DO NOT MERGE update current config with dhcp settings
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions