tree c21ab823a77aaef78b4e82b3f17e868c341cfe6c
parent d5f5d4174e22a1b1ab34721c617b7c85b49f8a49
parent 5ffd2f6f4fd50c2abeb7212221b24f7ef1979fa1
author Ugo Yu <ugoyu@google.com> 1568172584 -0700
committer android-build-merger <android-build-merger@google.com> 1568172584 -0700

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

Change-Id: I5b647f66f187e1bee38a89cb15ccd13eab6cfa7e