diff options
| author | Danielle Millett <dmillett@google.com> | 2011-11-09 19:34:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-09 19:34:44 +0000 |
| commit | ab3b1b497b042894a81aa120c579538448fa9c69 (patch) | |
| tree | 6191b555f84848c224a8aaca7664edba7eb10ded /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 50760d481e77f4aa5da1dbd8ccdf0202a1cc7155 (diff) | |
| parent | acc37017eeeb955f47809e55016e21ce7a2a458b (diff) | |
am b9b08257: Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1
* commit 'b9b08257370d244b4bccc4e243dda3c4daf4b0af':
Showing a congratulations screen after choosing face unlock backup lock
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions