diff options
| author | Steve Howard <showard@google.com> | 2010-09-28 12:41:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-28 12:41:42 -0700 |
| commit | 8839391976c0c1224c47dd45fb885a207e33c53c (patch) | |
| tree | e3fe56f3a9a380af64cd06de2c2cab32a08165a0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 989ee4e4605014607f3f7ed2ebfc41ecd94b8b14 (diff) | |
| parent | 1277bed7882970dba81d89219f67f904c0a66464 (diff) | |
am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread
Merge commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399' into gingerbread-plus-aosp
* commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399':
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