diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-14 21:59:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 21:59:39 +0000 |
| commit | 5df673d915ef9c9d4466ff1a7eeaf62f908c7aff (patch) | |
| tree | dc68056cee029d219044d04866700bbdcde54e11 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c05362b84cd55f6bac20a373b74f66a79577109d (diff) | |
| parent | f6f0946addc5230634ac2a09115097531dc6094b (diff) | |
am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge
* commit 'f6f0946addc5230634ac2a09115097531dc6094b':
Show the keyguard if unsecure window on top
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions