diff options
| author | Jason Monk <jmonk@google.com> | 2015-08-07 19:39:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 19:39:54 +0000 |
| commit | e0d9fe59856241fb34212b4ad160dbc8f76e4343 (patch) | |
| tree | c5cdd220cd677a9b17005ac4d8bdc9f7f2e1d164 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8857528dd454f3b1f6ec140c945275bb3690aae7 (diff) | |
| parent | 635270c5b69da17d80da5e165266ba655c12738e (diff) | |
am 635270c5: am a01965e2: am 69a07d40: am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev
* commit '635270c5b69da17d80da5e165266ba655c12738e':
Allow system to disable lockscreen
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions