diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-11-29 05:51:18 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-29 05:51:18 -0800 |
| commit | c6f48c6842614512c15d760c56a33d82abdee6f5 (patch) | |
| tree | 9ef07dd0fc2d70fbadd2cbb147b8ae5c9cdadfe6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ef56d02fe9155df1cd99c297e1d15f032940c4a7 (diff) | |
| parent | a6e18fc3de89cfb6432d75943b39f2ab7ed3f45b (diff) | |
am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1
* commit 'fed7a99a5294856d930e18225898828bd6755be1':
Quick fix for bug 5646217 blocking automation tests
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions