diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-07-13 14:55:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-13 14:55:20 -0700 |
| commit | a74e2aa3bc324a1870fd55e2fa6e618ffc23200e (patch) | |
| tree | 5ad214eecce158394dd89951ccd0ddcf72ed777b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8ca5b5e007484c562e8deffd8e66a851b82ecc8c (diff) | |
| parent | f22259c53335ad36c526d2152f823099fd3a5015 (diff) | |
am 0814a9aa: am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp
* commit '0814a9aa0c8f89f084ba37df05b3735274d78420':
NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
Fix missing NL
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions