diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-07-20 17:18:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-20 17:18:04 -0700 |
| commit | e5e476f18bc0fb0ceae14833fd3e697c41108c2d (patch) | |
| tree | 2e0bce0dc6ef3983a1547dca6f207a47d60275b6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 41ce328f7e19a10337f45074a3929c402020a180 (diff) | |
| parent | 7ffa22b98439d8440e75c5870831a6eb0fb256ec (diff) | |
am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
* commit 'a125c937de06b1cc43368743592f47513eb88b76':
Add generation of dependency file for .ap_ package
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions