commit d31acecdc4d83f1054c2dc98b7340e238087c89c
author Chalard Jean <jchalard@google.com> Mon Aug 26 23:30:18 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 26 23:30:18 2019 -0700
tree 1d9a2b1975c4a1b295773752aa86438ae3f0e650
parent 3a7db46d011b1ca2ef99c40d7619dee44fab931c
parent 3d03202f2139a1550a6d79ee801592e34ec7e65a

[automerger skipped] Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 am: f6fe877aff am: ad81a4ee9a am: 34fe9d6e44 -s ours am: 1c234d4add -s ours
am: 3d03202f21 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I9ad309eff261c2bd2569d68a561ed9241d673bdd