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