diff options
| author | Justin Ho <justinho@google.com> | 2010-10-15 18:23:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:23:18 -0700 |
| commit | f510542648d4d476bddfcb7befc32ed50bf83577 (patch) | |
| tree | bdce8b555bc04e61b7fe28987fe8db44786797e0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 64f81bbc113784f514ca33c6895d401c4f3602da (diff) | |
| parent | d4305a00011c1c5a643970eb381de112edbb42ac (diff) | |
am d3643668: Merge "DO NOT MERGE - Updated ADB icon" into gingerbread
Merge commit 'd364366824bf2b0aef81780eb673a42e0ba33bce' into gingerbread-plus-aosp
* commit 'd364366824bf2b0aef81780eb673a42e0ba33bce':
DO NOT MERGE - Updated ADB icon
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions