diff options
| author | Raphael <raphael@google.com> | 2011-12-12 13:16:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-12 13:16:35 -0800 |
| commit | 65e3a8c9713ca56ed0acc92ee2025e64d8a8d0e6 (patch) | |
| tree | 0784d17d80f88a0c09f9a2c4f6ecc4047af63cef /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ecc1b9a994f11203a29fd713141e5699ecb26260 (diff) | |
| parent | afcfa2f23ac63b354d52bde3c02da3ec3782106b (diff) | |
am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
* commit '2ace3b01ab9447ce9fda2f578e31c1c11f4837cb':
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