diff options
| author | Adrian Roos <roosa@google.com> | 2014-03-14 16:27:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 16:27:51 +0000 |
| commit | 70a0ea0e8de981a2a0c3fb296718256a2355ee2d (patch) | |
| tree | da78f32cb96b175406b1c4da7550d1f5104e7147 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 46bfaa1b93068c78ea5a2ab337ea8b98592b7c10 (diff) | |
| parent | 16858164c73f0696d12161e97bad9cb22c55e603 (diff) | |
am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev
* commit '16858164c73f0696d12161e97bad9cb22c55e603':
DO NOT MERGE - Fix keyguard pattern lockout bug
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions