diff options
| author | Joe Onorato <joeo@android.com> | 2010-08-31 15:29:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 15:29:24 -0700 |
| commit | 570141e04f70e942f9fe839a47ca2a089fcfeaac (patch) | |
| tree | 5e221092fc72811b07297d13a0c13f376d68b519 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | db466cbe5b12df28ba54e95ce733a0f8d12981bf (diff) | |
| parent | 00800b0be6925b45165bc75f636048016d62e756 (diff) | |
am 1e1a030b: am 47471175: Can\'t have two rules building the stubs and public.xml!
Merge commit '1e1a030b502acae11dbd11d826d389351910a60f'
* commit '1e1a030b502acae11dbd11d826d389351910a60f':
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