tree 0e2f96d992c43afd5a39075c03340c5266340c5c
parent 099a63fc2a5517ffe0d9c91481f85e651682cb14
parent f5441ae2b48cdea7a5f80b406836192138f5130d
author Matthew Xie <mattx@google.com> 1381361985 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381361985 +0000

Merge "Enable host interleaving BR/EDR device discovery and ble scan for flo" into klp-dev