tree faac7fa5903cd9f3bd74560c1fdd3ba177d98c15
parent e8626dee4272d1f0f8760929f4eb31e21375e251
parent b7afa3f6fbfe274427a56d425c12c113a016bc98
author Benedict Wong <benedictwong@google.com> 1517456985 +0000
committer android-build-merger <android-build-merger@google.com> 1517456985 +0000

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

Change-Id: I9c2a844d9ccc401a34d0e6318506406e8c33fab6