commit 74be0f20278360da3b95093da81a85a2efeb6b3e
author markchien <markchien@google.com> Tue Aug 27 18:19:46 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 27 18:19:46 2019 -0700
tree 46b2bce636a4cb7fb5747847fed40eefccba5169
parent 0bb467ab0062fd7906e7243da82dfc110bd6b330
parent b9184953f6dd7130a319a6bdd30cec1bbea33aba

[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: b9184953f6 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I9fc414222deda6e234b5dfd148036fdbfb653322