diff options
| author | Raphael <raphael@google.com> | 2011-12-12 15:39:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-12 15:39:30 -0800 |
| commit | 57f827dd76d70d5d33790eea784465717cd3a258 (patch) | |
| tree | 8cef08e323746a2ae01800c70e083ad67d7fcb9a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 25e4ab78aa2e6fae46b609ee26d0185858929829 (diff) | |
| parent | 65e3a8c9713ca56ed0acc92ee2025e64d8a8d0e6 (diff) | |
am ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
* commit 'ab8d6785dcefa5b2b66f6c042475a0f9f558dd45':
Merge "AAPT fix printf %zd crash on Windows". Do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions