diff options
| author | Justin Ho <justinho@google.com> | 2010-11-03 20:11:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-03 20:11:28 -0700 |
| commit | 2158186d459d630ce6e1f0c45cc6ffeb2ea68844 (patch) | |
| tree | 0cb98f4a140191ed56ffbdb595221945fade125b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8b4c5042a77c591a51e5a3112266b117e3077511 (diff) | |
| parent | 82d5353f734891d0b0f306061bc82fc5d4540faf (diff) | |
am ade230ed: (-s ours) am 112b5b1f: Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread
* commit 'ade230ed99097a09584a793ce720cc869c9ffeb4':
DO NOT MERGE - Updated VPNServices stat_sys icons
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions