diff options
| author | Steve Howard <showard@google.com> | 2010-09-28 16:34:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 16:34:19 -0700 |
| commit | 1bd71af7fae3e1ee6309a2132f339959c8d10d85 (patch) | |
| tree | 6948868fce1e6ea9301a77e49d9880f8df2e7449 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | be894b275b7471759309e46ab6d09154558db8d5 (diff) | |
| parent | 8839391976c0c1224c47dd45fb885a207e33c53c (diff) | |
am 9d9719c4: (-s ours) am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread
Merge commit '9d9719c44ad05834b48542ea0fc4edbb4f59c311'
* commit '9d9719c44ad05834b48542ea0fc4edbb4f59c311':
Move DownloadManager to android.app (DO NOT MERGE)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions