tree 48b3c7f1bea531376ebad70959a3769b8ffd1579
parent 29aa5c6260917197ec47d1dd5478032a8a905260
parent dcb921976433dd84c479b1227bea73da4ceb47c9
author Benedict Wong <benedictwong@google.com> 1517458338 +0000
committer android-build-merger <android-build-merger@google.com> 1517458338 +0000

Merge "Fix minor bugs with tunnel mode implementation" am: cb9cd96c50 am: b7afa3f6fb
am: dcb9219764

Change-Id: Ie74c4edcc7586e0220ff948222010e126841e8f7