diff options
| author | Ying Wang <wangying@google.com> | 2010-09-30 11:27:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 11:27:47 -0700 |
| commit | cb090610ca906deef0c93c076779d29da3560b60 (patch) | |
| tree | 6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1bbdc12f250d0c57e998cac9789d68bf4b744128 (diff) | |
| parent | 2aa9489fea2ed76d743835efbb8c442f68dce4fd (diff) | |
am 3b197dfc: am 3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread
Merge commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6'
* commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6':
Fix proguard flag file dependency.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions