diff options
author | Justin Ho <justinho@google.com> | 2011-09-22 23:39:49 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-22 23:39:49 -0700 |
commit | e5718aaecf8890bd9049ddaf63c09d4af113f257 (patch) | |
tree | 81e904ced86ff0d345781382171a55eb7a73bce6 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 55a1db61fd5837f868f04298a0db024b1ad5067c (diff) | |
parent | b426261759a28fc63a0c9fe9ed6ceffa31d9a4b8 (diff) |
am 777163e0: Merge "Updated emergency icon on lockscreen" into ics-factoryrom
* commit '777163e0466bda76d64809b5fd6a1a688de67099':
Updated emergency icon on lockscreen
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions