diff options
author | Craig Mautner <cmautner@google.com> | 2014-03-07 01:27:53 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 01:27:53 +0000 |
commit | 7442acf25baad47daea15569a2b85ffb22422bfc (patch) | |
tree | 007c8a4f3c2131104018a031c0e237f617164045 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d7b5caabfec09a617ebbdec3d566f0be061f516c (diff) | |
parent | f453f3a1685b14047533429aff15fd2e2ba3d7c9 (diff) |
am f453f3a1: Merge "Show the keyguard if unsecure window on top" into klp-modular-dev
* commit 'f453f3a1685b14047533429aff15fd2e2ba3d7c9':
Show the keyguard if unsecure window on top
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions