diff options
| author | Craig Mautner <cmautner@google.com> | 2014-12-02 21:20:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 21:20:17 +0000 |
| commit | e4e7d2cdf40407240d63ef4f0a3249e726a1d632 (patch) | |
| tree | 14370d7a9e2b31cda3bce61377b888a11eb8980e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 15b2d9ab44690156e067020e12b329997ef5bba6 (diff) | |
| parent | 41ec0400056daa97d40bd4a8225b7d4f0d665598 (diff) | |
am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev
* commit '41ec0400056daa97d40bd4a8225b7d4f0d665598':
Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions