diff options
| author | Dan Morrill <morrildl@google.com> | 2011-05-04 10:29:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-04 10:29:34 -0700 |
| commit | 55f6844c471769d3dbb786b18278a73e9d596fa5 (patch) | |
| tree | 89893129a55cf79038adfe36925ed61c6a36a08b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8fdedfd3d341345e6121d6734c55dd7ee4976cbf (diff) | |
| parent | b955b3327ef2f026f69c4fc286b53df15175db4a (diff) | |
am dacce73b: (-s ours) am 4ec33c2a: Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
* commit 'dacce73bcc53a21125f532d8000e7ec2e3c30a35':
Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions