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