diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-24 00:02:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 00:02:32 +0000 |
| commit | 9e289b05453f40f1e5855a972a53eaff92fe5268 (patch) | |
| tree | 0a3729be84a00697088f4aa9c442a4fc64b1fbd7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 793555452ad44c006657b6c511c5c6068c0317ba (diff) | |
| parent | 0063e0bcd55d1ed3b6c37c6616c0c858e0784a07 (diff) | |
am 0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev
* commit '0063e0bcd55d1ed3b6c37c6616c0c858e0784a07':
Disable Keyguard affordances before setup is completed
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions