diff options
author | Andre Eisenbach <eisenbach@google.com> | 2015-02-05 04:07:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 04:07:04 +0000 |
commit | e791f73202a2832b4d20dbc1ecd4b520adbb75d3 (patch) | |
tree | 4a03728029435e4fc12c1f3773d7608dca53fe01 | |
parent | 0ad6cfdee8857a7bc54d4c3eb98bf1cdc82dc9a7 (diff) | |
parent | ae9d174bc0afe0a7ed0bb4fb82836338fbb6adb1 (diff) | |
download | bluedroid-e791f73202a2832b4d20dbc1ecd4b520adbb75d3.tar.gz |
am ae9d174b: am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit 'ae9d174bc0afe0a7ed0bb4fb82836338fbb6adb1':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
0 files changed, 0 insertions, 0 deletions