diff options
| author | Erik <roboerik@android.com> | 2010-09-15 19:10:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 19:10:10 -0700 |
| commit | a8c89ee43ea3190c5f6eed1c3d505dc49184a486 (patch) | |
| tree | 247e2d025033d62db7eece1eb089109dd36e382f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 079218f778820979d5a082b1336e5e08da5161cd (diff) | |
| parent | 44c91568562f6963b40e833962edbe79ee0ed8dc (diff) | |
am bfbab8ca: am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread
Merge commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38'
* commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38':
b/3004029 Fixed content resolver loss
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions