diff options
| author | Jim Miller <jaggies@google.com> | 2012-11-08 13:08:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 13:08:41 -0800 |
| commit | 2c29deaa2650091d9206b8fa93f8a447ee247d52 (patch) | |
| tree | ad459dbf8ce0a10efe461916caa84f2410a086b6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2cfb9373fa1e1f1be107a310c49ef68722544aa3 (diff) | |
| parent | 6be441c532688762b735ae2a1276195b40bf33b4 (diff) | |
am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
* commit '6be441c532688762b735ae2a1276195b40bf33b4':
Add mechanism to kick keyguard to show the assistant
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions