diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-24 04:06:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 04:06:58 +0000 |
| commit | 86a87d27a07aaa6991ed95a33835ae32943f04b0 (patch) | |
| tree | e0ee0caa3d08185b8a78076b8307ac29db991bf4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2dd71cc16565d0183d940987aad168a4efcf6423 (diff) | |
| parent | d30691e577e1b0c0e91026c48d520dcbe9944bbd (diff) | |
am d30691e5: am caf526ef: am 9e289b05: am 0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
* commit 'd30691e577e1b0c0e91026c48d520dcbe9944bbd':
Disable Keyguard affordances before setup is completed
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions