diff options
| author | Scott Main <smain@google.com> | 2012-01-13 18:23:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-13 18:23:35 -0800 |
| commit | 3d66c696433a99864f1392a3b1a30aaacc76e2e9 (patch) | |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1f7dba4b26ca83a01b3f2d30c5ff9873f7f480f6 (diff) | |
| parent | 3d3293b131e610c52839417bbcefcf23c1e58ff8 (diff) | |
am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1
* commit '40d6e7d913fe865accb8313efdb87aacd6d71f18':
docs: mention x86 as a native platform filter
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions