| commit | dd9de69fa9d649886fc0c7683775d35d050c44d4 | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Tue Aug 27 16:05:39 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 27 16:05:39 2019 -0700 |
| tree | 5da4ea38afabf978480464652d75b93cc7a41c29 | |
| parent | 56909ca698d5703ca4d1ac06d14a504608012b64 [diff] | |
| parent | 02ec1bfb0cb3f007bf63d8fc03a252ad1828bbd7 [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: 02ec1bfb0c -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history Change-Id: Ifef30bd7c1d7c96fbf18d000e0c87b96076fb412