diff options
| author | Marco Nelissen <marcone@google.com> | 2011-06-15 12:20:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-15 12:20:57 -0700 |
| commit | 59ee48942bf9af184b9c57c73e6227684d1821d0 (patch) | |
| tree | 01e09e2a5586c79999831795bce23b509374fcce /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a6b1dd29b585c974e1009fd86ad531dcbe44fd49 (diff) | |
| parent | dd729fc173fdb9f4e7b95334b2715048602e868b (diff) | |
am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp
* commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0':
Ignore duplicate WAP push PDU source/destination port if configured
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions