diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-02-23 14:41:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-23 14:41:01 -0800 |
| commit | a2b2e7ddce045b640c9caf962eaef66730f25bbe (patch) | |
| tree | 899e555f67bd2818d2ea4081668a79c0c77958fb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | db38d281177b9072b27d3c09dd843f293b5cfced (diff) | |
| parent | c0be04416a67abce7a8879b2b9860edd511c51df (diff) | |
am b0e5326d: (-s ours) am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb
* commit 'b0e5326d8cc661448a7ff611d02d439d4a328a3d':
DO NOT MERGE No backup of country and sleep policy
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions