diff options
| author | Erik <roboerik@android.com> | 2010-09-15 15:54:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 15:54:27 -0700 |
| commit | 44c91568562f6963b40e833962edbe79ee0ed8dc (patch) | |
| tree | 14932a87458bbc9f1488a977ea1a1a31539b22af /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d4014122d7edf201a1396aadb369597f7e9cf28e (diff) | |
| parent | 15caeb81ad4195a3e6fae7610915bd83b2edd903 (diff) | |
am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread
Merge commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b' into gingerbread-plus-aosp
* commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b':
b/3004029 Fixed content resolver loss
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions