commit | c34765400303a5ff55eb24418c68f2ced599b214 | [log] [tgz] |
---|---|---|
author | Android Merger <noreply-android-build-merger@google.com> | Mon Aug 26 21:17:50 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Aug 26 21:17:50 2019 +0000 |
tree | 51cf27311927d936e6942300355659edc79b1ebc | |
parent | ddb681cafe8a89cceb97b8f740ae8a3eebe666c1 [diff] | |
parent | b3c63b6961fe894a0d7d7def2c2c68a021861ec6 [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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history" into pie-cts-dev