commit | 0cfcb1a47261f0aafd4451e510052a05039d5344 | [log] [tgz] |
---|---|---|
author | Android Merger <noreply-android-build-merger@google.com> | Mon Aug 26 22:51:54 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Aug 26 22:51:54 2019 +0000 |
tree | d70894cf3fe563b1e62154f42078e2fe2bcb16f5 | |
parent | ddce521efa1712f8d0c8502bd67784d2731a7689 [diff] | |
parent | e6e8603ce4b2bf285cda8aadc907ae7c6619ef93 [diff] |
Merge "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: c347654003 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history"