diff options
| author | Jim Miller <jaggies@google.com> | 2011-11-14 16:21:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-14 16:21:10 -0800 |
| commit | 6162960c1eda8cce32a236e7f805cc4fdf9cf656 (patch) | |
| tree | 10fc2c97212eb5dbae54f896f2ceaec15bd7766e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 017d80c1f9cd3a2bb4aea990d3e722a8b73ca838 (diff) | |
| parent | 3dd5567710168da330741cb4c4263cc03dd942f1 (diff) | |
am 3dd55677: am ff95f657: Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1
* commit '3dd5567710168da330741cb4c4263cc03dd942f1':
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