tree 5f200546a65b2f7c08c55bbc166732ad73e82941
parent 3b2ec923211c9d1d0c647f5b6dd47e7b5b4460ee
parent 8cc7055ff11ca6f511cc3a4b384b6775d40856d8
author Hansong Zhang <hsz@google.com> 1574483307 -0800
committer android-build-merger <android-build-merger@google.com> 1574483307 -0800

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

Change-Id: I6531a1bd4a4c57257285d4c54a4ee85546bcbc8a