tree afc0b9584cfcca603963b7e3050bed18436fb02b
parent 7e2dfd42d663624038ba9c8a0359897977d371bb
parent 3810c82975bb2d89a17d42071d19d33738fbbcc7
author Nitin Shivpure <nshivpur@codeaurora.org> 1535065855 -0700
committer android-build-merger <android-build-merger@google.com> 1535065855 -0700

Merge "L2CAP: Handle no idle timeout (0xFFFF)" am: 197aeea2e8 am: 9b1f626440
am: 3810c82975

Change-Id: Icca9f5dd7a10772204ec08c5c464b4426725e18b