| commit | b9184953f6dd7130a319a6bdd30cec1bbea33aba | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Tue Aug 27 18:13:37 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 27 18:13:37 2019 -0700 |
| tree | fecd8bb4da6adc2dd6b6faa8328b06e938f5711e | |
| parent | 99ef3aff51c90d2170dc27b7ac528e26d880b406 [diff] | |
| parent | dd9de69fa9d649886fc0c7683775d35d050c44d4 [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: dd9de69fa9 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history Change-Id: I25d1ae42e9af624b6fad6cc4c05449af1a286d94