diff options
| author | Mathias Agopian <mathias@google.com> | 2010-08-20 06:27:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-20 06:27:15 -0700 |
| commit | 569cf07b291612a5bcf7299c457ce7d457652558 (patch) | |
| tree | b3719b3d6d3e1b23addab82e7597eb65a88a4b2b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 86d92827a6af95d376b3e7187b95db75bcb9d4cd (diff) | |
| parent | 1339581c921eea51e885a8c5c237e66d3904bc51 (diff) | |
am 8e13ce52: (-s ours) am 26bcc7b4: Merge "revert hwcomposer HAL changes. DO NOT MERGE." into gingerbread
Merge commit '8e13ce52f3bb12bb53e37affde3eec9bdaabae5c'
* commit '8e13ce52f3bb12bb53e37affde3eec9bdaabae5c':
revert hwcomposer HAL changes. DO NOT MERGE.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions