diff options
| author | Scott Main <smain@google.com> | 2011-02-18 19:49:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-18 19:49:10 -0800 |
| commit | 8f427883ac1152efa7c4c7bae372e537833f482c (patch) | |
| tree | ecdab51cba08ffecb9e151cb2e02ede2c218af9a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d7a20cc3d9d971c85b5e852d2fe8ffdc69bc731d (diff) | |
| parent | de80fa0a1c9217cdf6c92a1b2c1051c6dccc384b (diff) | |
am b5d35088: resolved conflicts for merge of b842629c to honeycomb-plus-aosp
* commit 'b5d35088cbbbac53b052ec52f199de4ad8b061e7':
docs: update sizes and sums for tools and ndk
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions