diff options
| author | Dan Egnor <egnor@google.com> | 2010-08-06 18:59:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-06 18:59:49 -0700 |
| commit | 2a6e502ea23d6691af3305c0982bd8dd2733e08d (patch) | |
| tree | 509b165a9c92abd77498666313483d9216648e5b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 545fc38ee01bf6b6ab9441441e4275a5c178bcb6 (diff) | |
| parent | 6f678531b937750a9fe5cf0676363ad427239246 (diff) | |
am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit '799f2bb04102b4b692b52eed5c36aea9a8cde471' into gingerbread-plus-aosp
* commit '799f2bb04102b4b692b52eed5c36aea9a8cde471':
COMMENT ONLY change to fix some formatting glitches and
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions