Lorenzo Colitti c59cf64e93 am 0afed57e: am dc14068a: am e526668e: am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev ...

* commit '0afed57e60f501878973e30c501c6bda8d6d2155':
  Allow root and system to bypass the always-on VPN firewall rules

2014-10-16 18:54:51 +00:00

..

java/com/android/server

am 0afed57e: am dc14068a: am e526668e: am d04d6c91: am b7d85148: Merge "Allow root and system to bypass the always-on VPN firewall rules" into lmp-dev

2014-10-16 18:54:51 +00:00

jni

resolved conflicts for merge of 6290c048 to lmp-mr1-dev-plus-aosp

2014-09-29 15:10:23 -07:00

Android.mk

…