diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-09-29 22:13:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-29 22:13:44 -0700 |
| commit | 27dd99b46aaee146d7ef5493ba5e60ab9deb00f3 (patch) | |
| tree | 6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d4a1956aecc714e11c4cede6490e56b48ecab011 (diff) | |
| parent | b5327a4ac088590eeb7a45dcf573d31e1b38deb2 (diff) | |
am 1254b9c5: am cd386649: Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread
Merge commit '1254b9c534c5f027f8928fbb3e743e57d55bd13d'
* commit '1254b9c534c5f027f8928fbb3e743e57d55bd13d':
RTP: Revise the workaround of private addresses and fix bugs.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions