diff options
| author | Joe Onorato <joeo@android.com> | 2010-08-31 15:22:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 15:22:04 -0700 |
| commit | 00800b0be6925b45165bc75f636048016d62e756 (patch) | |
| tree | bb41ededcfd4319f2ab59bba7db9c754c4a413e5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 985f18ef3ac1d2e6d6aebcf1a819355846e228c2 (diff) | |
| parent | 6d29e3924090d75cd241970af998bca7296bc7fa (diff) | |
am 47471175: Can\'t have two rules building the stubs and public.xml!
Merge commit '47471175c9d19a00d06a77aa316dcda08be97deb' into gingerbread-plus-aosp
* commit '47471175c9d19a00d06a77aa316dcda08be97deb':
Can't have two rules building the stubs and public.xml!
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions