OSDN Git Service

Merge "Add AppOp for IpSec Tunnels" into pi-dev
authorNathan Harold <nharold@google.com>
Thu, 22 Mar 2018 21:35:36 +0000 (21:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Mar 2018 21:35:36 +0000 (21:35 +0000)
am: 8a047a0c52

Change-Id: I159d49219d2f75e1f5aeece4196638a8823fc029


Trivial merge