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