diff options
| author | Dan Morrill <morrildl@google.com> | 2011-05-04 12:47:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-04 12:47:51 -0700 |
| commit | d501c80db5c390989fa2f30c4350f3c532932296 (patch) | |
| tree | 6fa9206a9b1028672f44ec63fb27853b20b083eb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3b791365263dce7035b9aa20f3d18109483498dd (diff) | |
| parent | 55f6844c471769d3dbb786b18278a73e9d596fa5 (diff) | |
am 6d36190a: (-s ours) am dacce73b: (-s ours) am 4ec33c2a: Do not merge. Cherry-pick of Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to gingerbread.
* commit '6d36190a7379ec1783c6eb5a27c946118dd53648':
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