commit | 6b728e412c22549ef51c19315ccf9ab3b7e16885 | [log] [tgz] |
---|---|---|
author | Matthew Xie <mattx@google.com> | Wed Oct 09 23:40:09 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 09 23:40:09 2013 +0000 |
tree | 5dc52b5578ba4a4011b978fa0c6a6400d7844e87 | |
parent | 7939ed0c9a50c769e9e648a2d7751e0894b485ed [diff] | |
parent | 7f3e42943b834ff0f556cd5c063a896f54d53167 [diff] |
Merge "Interleave br/edr device discovery with BLE device scan for some targets" into klp-dev