| commit | 29d52f8e3d3a2f510ff36b68c9b923e3b4078744 | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Tue Aug 27 18:45:00 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 27 18:45:00 2019 -0700 |
| tree | 46b2bce636a4cb7fb5747847fed40eefccba5169 | |
| parent | 25f9a876d79300fb8e9aba8a1a3b94cd27c43bf5 [diff] | |
| parent | 74be0f20278360da3b95093da81a85a2efeb6b3e [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: b9184953f6 -s ours am: 74be0f2027 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history Change-Id: Ib8c205e19feb288cdc81daae9997d2e445f54781