commit | 02ec1bfb0cb3f007bf63d8fc03a252ad1828bbd7 | [log] [tgz] |
---|---|---|
author | markchien <markchien@google.com> | Tue Aug 27 15:31:04 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 27 15:31:04 2019 -0700 |
tree | 1f2e1f87243fe4c5a5cec3b1de558edee7c14a03 | |
parent | e5c49712869efe70a33aeffe1ac252d8f54e5193 [diff] | |
parent | f37b8ca988b50752104818f51e85df967234623c [diff] |
[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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history Change-Id: Iae9c3a8dc7aaf52936b8078f043bc6488ec7d4a1