| commit | acec5e43cf4c726b9f7caeb68109ad08ba6c0cc0 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Mon Aug 26 21:14:49 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 26 21:14:49 2019 +0000 |
| tree | 1d9a2b1975c4a1b295773752aa86438ae3f0e650 | |
| parent | 57a5075fd0d1dc75c1efcf975bf7b9592fb76b4a [diff] | |
| parent | 4839867519400607284abdd14ad3183018b0b4c6 [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: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: 8a4065394b -s ours am: 5be8f14258 -s ours am: ec58302ece -s ours am: 9d6bb2d8c1 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history" into qt-r1-dev-plus-aosp