diff options
| author | Justin Ho <justinho@google.com> | 2010-10-15 18:24:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:24:30 -0700 |
| commit | da8da48016572edd857158ad04243fe33f4d24e2 (patch) | |
| tree | bdce8b555bc04e61b7fe28987fe8db44786797e0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 03ec8722774ff879414e0026101ffc9557a8b2db (diff) | |
| parent | bdcc5ce05ab870b78f8460f0c8233a1855567617 (diff) | |
am 73dbdc35: Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread
Merge commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940' into gingerbread-plus-aosp
* commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940':
DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions