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