tree c474ba7f048cc0be8c97faa53b4edff13bf1e185
parent e9b22cc767ac917b678501fc7597b24194e51160
parent 9335eec5c23419a44709dce2be1b812a6ac406ba
author Hansong Zhang <hsz@google.com> 1574835381 -0800
committer android-build-merger <android-build-merger@google.com> 1574835381 -0800

Merge "L2CAP: Store channel configuration state in a separate class" am: f2e2339fd6 am: 2d66f3357e
am: 9335eec5c2

Change-Id: Ib723954c5e1aa0774d9645470881064d3d20d53a