tree 505df16e56e26ebe3c6b7c41a543284453fc12e5
parent 15e07473a7af9bd0b9a2974a526e8c155db50aa0
parent a096a71365d9ebe2a4b11feb5b9a85e01814e38f
author Hansong Zhang <hsz@google.com> 1574360615 -0800
committer android-build-merger <android-build-merger@google.com> 1574360615 -0800

Merge "L2CAP Basic and ERTM DataController initial unittest" am: f9638a68ea
am: a096a71365

Change-Id: I6aaf11bb638e0d7df863ca393897b060e478d319