diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-13 19:40:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 19:40:49 -0700 |
| commit | 00e12e61472d850c00cf1e479fda2b371ead1257 (patch) | |
| tree | 6ad06361a295aa0b56ca2a5fa9c4166341552943 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b37768816cd9c530dcbb3a8f51d87536406a975b (diff) | |
| parent | 1066fc61a371443e9423f890f6f7615f2d1e4c6c (diff) | |
am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev
* commit '1066fc61a371443e9423f890f6f7615f2d1e4c6c':
Show the keyguard if unsecure window on top
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions