diff options
author | John Wang <johnwang@google.com> | 2011-09-21 18:56:47 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-21 18:56:47 -0700 |
commit | b156ea7fc671db7e8244a17096a990875bb35a0e (patch) | |
tree | 1c6853c5f20192442da407907030a287419d8108 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | a229a38557202dcdf1bceb4e64ddff708f7d5458 (diff) | |
parent | def0f98acf685b509fbfedfb0ca4011538ae8442 (diff) |
am 27b402ab: Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom
* commit '27b402abe5c24a3e21a39458541001ea91465b8f':
Set enable_puk_unlock_screen true by default.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions