commit | 9f4a5995a2646fd07461781102c84fbf8ca3b364 | [log] [tgz] |
---|---|---|
author | markchien <markchien@google.com> | Wed Aug 28 17:31:36 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 28 17:31:36 2019 -0700 |
tree | 46b2bce636a4cb7fb5747847fed40eefccba5169 | |
parent | c677b7a3602de9388897c017257910923f6ec9a9 [diff] | |
parent | 0cb9eae765a6de1d45e854a3be9d4067ae37bb39 [diff] |
Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 7ff168c7a1 -s ours am: 07e500dd00 -s ours am: 10d149e4bc -s ours am: 0cb9eae765 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history Change-Id: I024a87b3f96d7bee5cab27cac93b9028c1e18241