diff options
author | Adrian Roos <roosa@google.com> | 2014-03-10 17:00:11 +0100 |
---|---|---|
committer | Adrian Roos <roosa@google.com> | 2014-03-13 13:42:29 +0000 |
commit | 91c9561cbe665f91e1665f30362c409ae180b127 (patch) | |
tree | 3359ed12b0377f69f981e07bbaaf8c206630e381 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7f2c9e9420252a493b7399639f794c8a963444e5 (diff) |
DO NOT MERGE - Fix keyguard pattern lockout bug
(cherry picked from commit 7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
Conflicts:
packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
Bug: 13302967
Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions