diff options
| author | Ying Wang <wangying@google.com> | 2010-09-30 09:33:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 09:33:19 -0700 |
| commit | 2aa9489fea2ed76d743835efbb8c442f68dce4fd (patch) | |
| tree | 98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0046c5372540a45152088e6f8bc292642d8a978b (diff) | |
| parent | 11be2e62e24861ed58958a8f988420b4c3ebebd9 (diff) | |
am 3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread
Merge commit '3caaa64e866fa3aba1d5ba3070a3b092bb835a93' into gingerbread-plus-aosp
* commit '3caaa64e866fa3aba1d5ba3070a3b092bb835a93':
Fix proguard flag file dependency.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions