diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-03-11 15:17:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-11 15:17:44 -0800 |
| commit | 3bdb000ce7977d9fb873f5e9987176fdf8107274 (patch) | |
| tree | 4002d2a00b33089c926d4f693be7e4138052184a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | bd35d2d88c0e256c11063766e55ecca0a457c93d (diff) | |
| parent | d395d372c1a55b5dfd982a81eea852d23905d810 (diff) | |
am 618377d8: Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '618377d83d4a280c2e0f89642bfb1046d387ad7d':
Don't accept a user-defined dun-capable connection
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions