Robin Lee 0ab7ea1701 Merge "Make some of the UID-based VPN code reusable" into nyc-dev ...

am: 89bf3e3aa2

* commit '89bf3e3aa2b3e95486445a50f4666a20b3d8e830':
  Make some of the UID-based VPN code reusable

Change-Id: I3f1b1a08059aa58cb76db6cdd070b103024b9bf3

2016-05-17 17:36:43 +00:00

..

java/android/net

Merge "Make some of the UID-based VPN code reusable" into nyc-dev

2016-05-17 17:30:01 +00:00

jni

resolve merge conflicts of bc90502 to nyc-dev-plus-aosp

2016-05-13 08:57:40 -07:00

tests/coretests

NetworkStats.Bucket API polish.

2016-03-14 11:24:12 -07:00