tree edea1822034881f84ef66f49e40d6a11efda600c
parent 87bb1ee3867b084602dbd323741cae655e2307ab
parent 7eac0c8aa3bcf0528b707888acc89d39f31b45eb
author Hansong Zhang <hsz@google.com> 1574483156 -0800
committer android-build-merger <android-build-merger@google.com> 1574483156 -0800

Merge "L2CAP ERTM: Drop invalid packet on reassembly" am: 16210d5a08
am: 7eac0c8aa3

Change-Id: Ia3a85b7d943eca9b155ebc5f795d1e086c625ad5