diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-12-02 12:48:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-02 12:48:35 -0800 |
| commit | 5c33d1cadf31e8fccaa8657720b48157bcf53ec6 (patch) | |
| tree | 48623910fe75822605f4a4c5884e8b8bcd745d86 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 75a3e54e661133cca373cad7a6fe398e17440aa5 (diff) | |
| parent | 6c8163c640114ddb62dc1e6b77fd4248d67f6fff (diff) | |
am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0
* commit '25bcbbb5971e2832c3020ee406b27d641d4ca05b':
Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions