diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-10 15:47:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 15:47:34 -0700 |
| commit | d60e3f4272a94a563cdb1367737b022ca0fc2534 (patch) | |
| tree | 3a3e8b93d010e337d289c228cd6109a2ba412d93 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | adf78d86d71b61095fd035005e6cf777138b9bb7 (diff) | |
| parent | a859dedd648154c8469cbc2035582cd81e311d3e (diff) | |
am 962e4826: Merge "Allow two SurfaceViews inbetween the app and the wallpaper."
Merge commit '962e482606e3f8f8c0b8e540888eaef56a1c8603' into gingerbread-plus-aosp
* commit '962e482606e3f8f8c0b8e540888eaef56a1c8603':
Allow two SurfaceViews inbetween the app and the wallpaper.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions