diff options
| author | Jason Monk <jmonk@google.com> | 2015-08-07 18:46:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 18:46:58 +0000 |
| commit | 69a07d401a3d40de6d5f17eeaf642db12401fe2f (patch) | |
| tree | 1ed3a15605e21a01e49eec7e65274d0d5505ed2e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 85b3d0347955d7244f7d5b89f80482a73e70a0ed (diff) | |
| parent | 69ed33087d77e32a1f1475adf00b9d87580960aa (diff) | |
am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev
* commit '69ed33087d77e32a1f1475adf00b9d87580960aa':
Allow system to disable lockscreen
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions