diff options
| author | Marco Nelissen <marcone@google.com> | 2011-06-15 13:44:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-15 13:44:56 -0700 |
| commit | e19dcfa979e2fb98b1f63a893c4f299d2b39b9e6 (patch) | |
| tree | 9afdd1fa266ef7914943b2ada0a0193581ac1891 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | eb78b029ef1e9d6c5ccd09037fe3033835fbf5c1 (diff) | |
| parent | 59ee48942bf9af184b9c57c73e6227684d1821d0 (diff) | |
am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp
* commit '9c3c3004c4206da3f2579e863ce89a2f99269dd6':
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