diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-06-14 11:39:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-14 11:39:26 -0700 |
| commit | bb08fc1619e2d67e256652fe99ccf1b3d6cc16c2 (patch) | |
| tree | b4da8c3c152fcf1b2ad6f89e6018a9837c75513c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ec98ac7ec178d663600cf3a6653991ccd6c7c4dd (diff) | |
| parent | aed0cae0554fdecf9bfcf7e0b50f461dea9d7a46 (diff) | |
am 864c68ea: merge from froyo-plus-aosp
Merge commit '864c68ea452baa0f4f298faf2155af45a9b6d60c'
* commit '864c68ea452baa0f4f298faf2155af45a9b6d60c':
Added an addAll to the ArrayAdapter
WLAN: Reset power save mode to startup value after DHCP response.
Add PageUp and PageDown hot keys
Should accept "application/vnd.wap.multipart.alternative" message.
replaced deprecated getIntent with parseURI
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions