diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-04-14 12:11:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-14 12:11:17 -0700 |
| commit | 4e52bafe10708dc3e5ed9ee47f95d0a916e07895 (patch) | |
| tree | 744fcc6bd303f071d2ff642be0cefb7e8d8247b6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7cb5382837ad2dbbfb04d1f63bd5157c2f664511 (diff) | |
| parent | 21989a73b7409951d82b426709bead1675cc78b7 (diff) | |
am 11d7502b: am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo
Merge commit '11d7502b35374da12168004e277bcc87f4f7bb50' into kraken
* commit '11d7502b35374da12168004e277bcc87f4f7bb50':
Fix issue #593153: Broadcast time out when sending...
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions