diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-03 22:45:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-03 22:45:49 -0700 |
| commit | 01686df93bce19bfc295426462434d54390458f9 (patch) | |
| tree | e6d5067ea5511b294bbe82388abfef5bbd1833c1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6b16e915fea1ba57e76781914f16c960e160997a (diff) | |
| parent | ae4bfa97edc37a8a9e9db2a5bdb35be9c4ba13ed (diff) | |
am 5cab38ba: Merge "SIP: minor fixes." into gingerbread
Merge commit '5cab38ba11d976c54f28f4bdbced78040cba1cbb' into gingerbread-plus-aosp
* commit '5cab38ba11d976c54f28f4bdbced78040cba1cbb':
SIP: minor fixes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions