diff options
| author | Jim Miller <jaggies@google.com> | 2012-01-12 13:37:58 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-12 13:37:58 -0800 |
| commit | 0b92eb4b8c2cfd1230245e387424df19ae0535d9 (patch) | |
| tree | 63a85a10df422dafa46a8e082fbf40a79c6113f7 /graphics/java/android/renderscript/ProgramFragment.java | |
| parent | 494a17761d524c53b26f198e59f4f82af2cf0abf (diff) | |
| parent | 1aff11be4585d6ddff784d7e74188963050805fa (diff) | |
am 1aff11be: am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '1aff11be4585d6ddff784d7e74188963050805fa':
Fix 5620754: don't show pattern screen after SIM PUK unlock
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions