commit | 9ccbe8219b76df31e9613cc240d7b796904c4c03 | [log] [tgz] |
---|---|---|
author | markchien <markchien@google.com> | Tue Aug 27 16:20:01 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 27 16:20:01 2019 -0700 |
tree | 5a96eb316dba8acbcbaeb4b13b3a3b4c9f558dd3 | |
parent | 935c961f672d7ff4a2a6674df5866a2776435e34 [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 dd32bb52f7 is in history Change-Id: I52d883ff11b26ab95d8c068c74c1c93ef3cee0c6