tree 1594b144c20894f1b14ea37952e6af0ae0f1ebb1
parent 2b4f3e3327f2c94364be4261ce60a505a03d416e
parent a7cc7c5b4edb125961bf5c219ecf57bce7876db5
author Robin Lee <rgl@google.com> 1463507565 +0000
committer android-build-merger <android-build-merger@google.com> 1463507565 +0000

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

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

Change-Id: Ie7c88ba3eebe4af85a69f330cae3df3293113d4e