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