Robin Lee dd58655f81 Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: b0f3016b64 am: a7cc7c5b4e ...

am: 1cd027befe

* commit '1cd027befe8206fe4c33b1efff2bebb0584c138c':
  Make some of the UID-based VPN code reusable

Change-Id: I75d9871f8039d14f8d83be4696c3c4d4e864f9c0

2016-05-17 17:59:59 +00:00

..

java/android/net

Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: b0f3016b64 am: a7cc7c5b4e

2016-05-17 17:59:59 +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