tree 18e61fdf1b63876afcef2f8452d1918b613d0b2c
parent cda7ca998f4c3eea8a5b42900ca2001f185fe534
parent 384975540b2dba49483e13bff12b8d178bbaafe8
author Hansong Zhang <hsz@google.com> 1574391334 -0800
committer android-build-merger <android-build-merger@google.com> 1574391334 -0800

Merge "L2CAP Allow updating ERTM config and FCS" am: c82a7f9f15
am: 384975540b

Change-Id: I7c58fe5a16be810ac6e314dea37962c6604064d0