commit | ec9bd5ca7c8ffb9a334709e0eb11a0c1505d27db | [log] [tgz] |
---|---|---|
author | Android Merger <noreply-android-build-merger@google.com> | Thu Sep 12 17:08:43 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Sep 12 17:08:43 2019 +0000 |
tree | 70469b73b798a3b898f2078e7209935f39c86d4a | |
parent | 885a2e8bc1c847de0821bac9d2043ba7fe74fca3 [diff] | |
parent | ef3f583da4ed0707a846f4b21d99184ccf6eae1f [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: 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" into android10-tests-dev