commit | e2cf372833ec13970284e273aedfe5c9f6b97205 | [log] [tgz] |
---|---|---|
author | Chalard Jean <jchalard@google.com> | Wed Aug 21 01:59:29 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 21 01:59:29 2019 -0700 |
tree | 279460320122fe6fb9b7de7bbf592caea99e2cc1 | |
parent | 6591499e44cab96b21173d56fbbf73a5dbcb5c9d [diff] | |
parent | acc1c3ab97036924c3dcaafda94a6f7bc8981918 [diff] |
[automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours am skip reason: SHA1 acc1c3ab97 skipped by user jchalard Change-Id: I875c775b9144b02bb06cc69d1702f7e62170879b