diff options
| author | Craig Mautner <cmautner@google.com> | 2014-12-03 00:29:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 00:29:30 +0000 |
| commit | 7ef0d514c39bd9abba124e927d1aed60a227a5b3 (patch) | |
| tree | 1e1b3863201d21dbf856ef9005a68ea36f25d018 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cacd99bd2cbfad3bfd78bef3d4c612ddda2e2ad7 (diff) | |
| parent | 61a7b7cff57dc66a1f64c9d7519fc1f6844b6915 (diff) | |
am 61a7b7cf: am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev
* commit '61a7b7cff57dc66a1f64c9d7519fc1f6844b6915':
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions