diff options
| author | Jeff Davidson <jpd@google.com> | 2015-02-11 08:37:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 08:37:30 +0000 |
| commit | 5d8a31c46c947c2c5f56669c00e6c8aea31c47f7 (patch) | |
| tree | 45b94981c8a92028c9549de17baf5f450849be0d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e1507ac506a4dac327a5cbabede0384836659de0 (diff) | |
| parent | 46dbb5be4c56e8af603514a3cf2bd7daf0191724 (diff) | |
am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
* commit '46dbb5be4c56e8af603514a3cf2bd7daf0191724':
Do not enforce CONTROL_VPN for calls from lockdown VPN.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions