diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-30 10:09:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 10:09:53 -0700 |
| commit | dbe52c0a08b30cc8808a76a2a962ef2059be29b7 (patch) | |
| tree | 98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 45c9dae7f0270677a0b3caa7550648bc98348768 (diff) | |
| parent | bd3398c440a57d8cb363701cd7f51d8af919b982 (diff) | |
am 2365b78e: Merge "SIP: misc fixes." into gingerbread
Merge commit '2365b78e64feaa9527efb15bf4ac207a837f2b45' into gingerbread-plus-aosp
* commit '2365b78e64feaa9527efb15bf4ac207a837f2b45':
SIP: misc fixes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions