diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-04-25 04:23:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-25 04:23:01 +0000 |
| commit | 067b9dc406513530a3f4550ba9721d2fc9154fc1 (patch) | |
| tree | 8fd8137ec9b041d094f7259ceb4da3937fdfbbc0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7c94df4903410aa2b889d85a977229c0859d1e5b (diff) | |
| parent | 123847466ea23336cc485cc09f8a233866d3f035 (diff) | |
Merge changes from topic "niap-vpn" into qt-dev
* changes:
Reinstate new VPN uid filtering unit tests
Revert new tests and PackageManager mock
Block incoming non-VPN packets to apps under fully-routed VPN
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions