diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-16 13:11:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-16 13:11:24 -0700 |
| commit | cbf3ce51c892a6de9a6fb66d6c81004c3a9ddb7e (patch) | |
| tree | 5797ce3709bc320265cc9813cbf915f88d9c70d1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cd44b8a48604e7f89642a322dbc838cade48d4a0 (diff) | |
| parent | a84e8649dabf2f046399e7d8d276c3e9e3b40146 (diff) | |
am f97ed771: (-s ours) am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
* commit 'f97ed771979162c4a2a75959c57fb793438a3a8b':
DO NOT MERGE. Integrate from master: Rework display size access.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions