OSDN Git Service

Merge "Fix fwmark handling for bypassable VPNs and DNS." into lmp-dev
authorSreeram Ramachandran <sreeram@google.com>
Mon, 28 Jul 2014 18:52:15 +0000 (18:52 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 24 Jul 2014 15:36:21 +0000 (15:36 +0000)
commit507e7c5bbfcd1d68f67477866497adb1748c5fd5
treea84de38830da3d0446143384d9e3f3fef969d1d1
parent48e19b037e7e20674048ef76bf31ce65c741347c
parent1011b4941d96d9fd90bc7243be387b63ec775936
Merge "Fix fwmark handling for bypassable VPNs and DNS." into lmp-dev
server/NetworkController.cpp
server/NetworkController.h