diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 08:33:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 08:33:23 -0700 |
| commit | 2222fb317ada2df48e22da78f35f06a27d9255af (patch) | |
| tree | e44a9222f8a53d8bafecfa4fad9751e557134a8d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cc0b19dad53055a392eb10e88e98186f8b57c2bd (diff) | |
| parent | 48ffcfce90e4ce6e2f7e79d7a7ab6b71a765110c (diff) | |
am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread
Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f'
* commit '27c7fb1a861776b4fdc2632697e4e25eee83617f':
Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions