OSDN Git Service

Merge "Add TunnelInterface API and KernelResourceRecords"
authorBenedict Wong <benedictwong@google.com>
Wed, 24 Jan 2018 08:55:38 +0000 (08:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Jan 2018 08:55:38 +0000 (08:55 +0000)
am: f811dff3bc

Change-Id: Ic8a93b2d6d8280c01808968251e6f422fa1d2340


Trivial merge