diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-16 07:49:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-16 07:49:13 -0700 |
| commit | 8a3c61d5a3a5b926abfc7c2de032326289fb9985 (patch) | |
| tree | 2fed2a1b5554564516fea635675738dc56e8118e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 29bd2fadbf7b6c4bdc26dc5c7b40997cfaa954ce (diff) | |
| parent | 024c8705bb0bc392dbec31c85652dbba14233c32 (diff) | |
am 73815413: Ignore 87624778
Merge commit '7381541309d515f780879d23857675c9c8ee9344'
* commit '7381541309d515f780879d23857675c9c8ee9344':
DO NOT MERGE WLAN: Reset power save mode to startup value after DHCP response.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions