Nathan Harold 5d63f152ba Merge "Disable the AppOp Restriction for IpSec Tunnels" into stage-aosp-master am: bda7c96038 ...

am: b0df70b6ed

Change-Id: Idb6ff2adc72d0a293e1d99c287d0df68df88fe79

2018-06-09 09:43:53 -07:00

..

android

Merge "Send empty LinkProperties when entering StoppedState." am: 59ccf1041f

2018-06-04 11:49:28 -07:00

com/android

Merge "Disable the AppOp Restriction for IpSec Tunnels" into stage-aosp-master am: bda7c96038

2018-06-09 09:43:53 -07:00