diff options
| author | Steven Ross <stross@google.com> | 2011-10-13 21:04:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-13 21:04:15 -0700 |
| commit | 2a3cda648f538da134cfa8c626521e3a9dbfe568 (patch) | |
| tree | b2acce615b6160297889c9bff044db5b75a1b73f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 04169673b50dd9f16a6f53af089c702d66eb8009 (diff) | |
| parent | 3406886939b0f28c426acefbe9dc77292210d8b4 (diff) | |
am 34068869: Merge "Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341" into ics-mr0
* commit '3406886939b0f28c426acefbe9dc77292210d8b4':
Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions