tree ff0256c217959e5edafb9463fb8c0a617164e3ae
parent 4b9fcd991738dccd316a54a5c8f144dafb17203c
parent c1d412940266f8d2b151535a41590982cd0438df
author Jakub Pawlowski <jpawlowski@google.com> 1559902328 -0700
committer android-build-merger <android-build-merger@google.com> 1559902328 -0700

[automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 0cf7f2c909 -s ours
am: c1d4129402 -s ours
am skip reason: change_id Iab0fd9f357d18a6b048b971d0393fbb47fd4d793 with SHA1 4b9fcd9917 is in history

Change-Id: Idd9e3a1ffa28ca0de51f37b043c452b0cde9fcfe