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