| commit | f37b8ca988b50752104818f51e85df967234623c | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Tue Aug 27 14:56:28 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 27 14:56:28 2019 -0700 |
| tree | a36ea02365bce399b385e2e9d7793eaf202735f9 | |
| parent | 0ce247cdd85cbdb5c18f59cdc38097e774c6b35c [diff] | |
| parent | e693a1fd0fe0bec10aca0d14e806cfc826cc73ed [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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history Change-Id: I8efb6a710eb1925d725c4c8aeb61d5240b93a423