diff options
| author | Jim Miller <jaggies@google.com> | 2011-11-14 16:16:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-14 16:16:28 -0800 |
| commit | 3dd5567710168da330741cb4c4263cc03dd942f1 (patch) | |
| tree | 5936fa76342d0816f352b663330e3cf1db455198 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8340db9e9b3363924b47f4d67d57ddb19a4c7702 (diff) | |
| parent | ff95f6572596c48b58f5a73d23b2273866ea3fab (diff) | |
am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1
* commit 'ff95f6572596c48b58f5a73d23b2273866ea3fab':
Fix 5579440: Add transport control view to tablet unlock screens
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions