diff options
| author | Jeff Davidson <jpd@google.com> | 2015-02-11 08:30:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-11 08:30:44 +0000 |
| commit | 46dbb5be4c56e8af603514a3cf2bd7daf0191724 (patch) | |
| tree | 2f09b351faed4c4b212fd6903b707f27ceef25a0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 00c8450d2711de57ee45f66cae1050dbca98d1f5 (diff) | |
| parent | 50996a12a8e859346d5eb3c4569c4e81c9b52a05 (diff) | |
am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
* commit '50996a12a8e859346d5eb3c4569c4e81c9b52a05':
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