tree ef1c82707bf7274b04bdce3eec6f7365290e09e8
parent 730f4226fd3207a20542f37640ae7b8acbabb652
parent edb3f7f143ad31f940f9954ec2b04b8de87f132c
author Ugo Yu <ugoyu@google.com> 1568173005 -0700
committer android-build-merger <android-build-merger@google.com> 1568173005 -0700

[automerger skipped] Merge "Store BLE keys using the address from the ble_auth_cmpl_evt" into qt-dev am: 5ffd2f6f4f -s ours
am: edb3f7f143 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 9f78214f72 is in history

Change-Id: I8be4946ae5a23fae8a2da71b68e41a8f427b0bca