OSDN Git Service

[automerger skipped] Merge "Store BLE keys using the address from the ble_auth_cmpl_e...
authorUgo Yu <ugoyu@google.com>
Wed, 11 Sep 2019 03:29:44 +0000 (20:29 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Sep 2019 03:29:44 +0000 (20:29 -0700)
am: a9b50ae838 -s ours
am skip reason: change_id I18b4a1d8e2cdcd6dd4a300f1dc9e6d3892a3baff with SHA1 a65f859b17 is in history

Change-Id: I5b647f66f187e1bee38a89cb15ccd13eab6cfa7e


Trivial merge