diff options
| author | Kenny Root <kroot@google.com> | 2010-08-05 11:46:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 11:46:32 -0700 |
| commit | 45b0c84438afbb7beda94264a31e9f5c6faf0c89 (patch) | |
| tree | 30fbfeb62560c8503a6f8e32e9624c129f98c194 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b0c41be4ee95c8554f1e409072d21e8cf438e4b6 (diff) | |
| parent | ef0f8760efc68f124a3fb7d3a94df040530c6167 (diff) | |
am d6dc45c3: am 125816a2: Merge "Failure to move .dex in eng builds is not fatal" into gingerbread
Merge commit 'd6dc45c30c1704fca9ec33f51c7c4ec1bee515ea'
* commit 'd6dc45c30c1704fca9ec33f51c7c4ec1bee515ea':
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