commit c5f02a73478b25825712a130a025dfe33b283ef9
author markchien <markchien@google.com> Tue Aug 27 18:11:22 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 27 18:11:22 2019 -0700
tree 46b2bce636a4cb7fb5747847fed40eefccba5169
parent ab91e6151206a24e4f467a87e6e8533b09da0836
parent 9ccbe8219b76df31e9613cc240d7b796904c4c03

[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 98a30a1eec -s ours am: e693a1fd0f -s ours am: f37b8ca988 -s ours am: 02ec1bfb0c -s ours am: dd9de69fa9 -s ours
am: 9ccbe8219b -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I50b01dd298c9a2209c7de139dedb179496cc1a97