diff options
| author | Jim Miller <jaggies@google.com> | 2012-11-08 13:08:55 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 13:08:55 -0800 |
| commit | 271add4e09af034406188e13c3289e967108c84f (patch) | |
| tree | 75fac5ce8da318d4578d267d9a1cde33c64a0702 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 47674796bc1ca3c2d0d154a107e8e29b51389bc5 (diff) | |
| parent | 899e6c738341698c71689e31630c0b8663057e44 (diff) | |
am 899e6c73: Merge "Fix bug where SearchPanel wasn\'t launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev
* commit '899e6c738341698c71689e31630c0b8663057e44':
Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions