diff options
| author | Ben Murdoch <benm@google.com> | 2010-04-01 08:44:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-01 08:44:58 -0700 |
| commit | 9859ba197a026198e146cb5dbff2ee0e12ef628b (patch) | |
| tree | 7a13d65bca39938309b90f95dfb57f45aedfe844 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9129fe79806a5b656a3c50fc11323ade81890cae (diff) | |
| parent | 057779af45a29c1c488150370964bf9526ceb954 (diff) | |
am 352cf1a4: Merge changes Ic9531e3c,I3f04433b into froyo
Merge commit '352cf1a45e26803a466d096ca2d679ea5a3ac249' into froyo-plus-aosp
* commit '352cf1a45e26803a466d096ca2d679ea5a3ac249':
Cherry pick from master.
Cherry pick from master.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions