diff options
| author | Jim Miller <jaggies@google.com> | 2013-11-08 11:01:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-08 11:01:57 -0800 |
| commit | 44ee0fb144947206713e6527a5227fd44e2d4e1e (patch) | |
| tree | a82ee2eb07170e8570cb2128a3ba3212c7f29c2c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ca39478f33977ba6ba278fb9e3913144d7a5d0c2 (diff) | |
| parent | c55edb266f96364277b4a3552295c94363d847fb (diff) | |
am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev
* commit 'c55edb266f96364277b4a3552295c94363d847fb':
Delay tearing down external displays until keyguard finishes
Show keyguard scrim on external displays while keyguard showing
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions