diff options
| author | John Wang <johnwang@google.com> | 2011-09-22 23:39:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-22 23:39:37 -0700 |
| commit | 55a1db61fd5837f868f04298a0db024b1ad5067c (patch) | |
| tree | 81e904ced86ff0d345781382171a55eb7a73bce6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8509b5e3dd2ca305042d1c79fe45f4760506ad02 (diff) | |
| parent | 889497d1e2faafaa1c58254e634fa012262fddab (diff) | |
am dd6d1bbd: Merge "Update PUK unlock screen." into ics-factoryrom
* commit 'dd6d1bbd15c4e5cf1b3e0ac34c96f29fb04863c6':
Update PUK unlock screen.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions