commit | d8931d05d13aa7f1191667592cb4da326133e669 | [log] [tgz] |
---|---|---|
author | markchien <markchien@google.com> | Mon Aug 26 15:51:47 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 15:51:47 2019 -0700 |
tree | e4dd05f2de811443ab1da4f45ee2762858c8096f | |
parent | 2acf24865e04012e1dd161c6d0ff9531dac5c53b [diff] | |
parent | c10e37682b15614f2d2021346a64b91f56e3f1d1 [diff] |
Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: ad4335d5c5 -s ours am: 89ef28e265 -s ours am: a28c13df9e -s ours am: c10e37682b -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 affe82b1a8 is in history Change-Id: I4ebcb8b4ab7ac188f4d467af54f6babd4f3682c5