Jeff Davidson 30ddc724a0 Merge "Don't enforce control permission when preparing consented VPN." into lmp-mr1-dev

2014-11-24 21:19:56 +00:00

..

core/java/com/android/server

Merge "Don't enforce control permission when preparing consented VPN." into lmp-mr1-dev

2014-11-24 21:19:56 +00:00

tests/servicestests

Eliminate race conditions in UID-based network filtering.

2014-11-21 08:07:13 -08:00