diff options
| author | Kenny Root <kroot@google.com> | 2010-08-04 15:03:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-04 15:03:56 -0700 |
| commit | ef0f8760efc68f124a3fb7d3a94df040530c6167 (patch) | |
| tree | 420413d5210dccca6711259b895d393b733c42e0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5050148024f273fd0ef4aafdd6e877f9abeb6ab4 (diff) | |
| parent | c10d3b94967ac380717061daba732afe2321703d (diff) | |
am 125816a2: Merge "Failure to move .dex in eng builds is not fatal" into gingerbread
Merge commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0' into gingerbread-plus-aosp
* commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0':
Failure to move .dex in eng builds is not fatal
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions