tree 03b6879fc3f6639687bafb500757715fdef02c19
parent 38bdb5b46bc8dc26c58f4fb93267eb4cd795ea41
parent 8dc2cb8210cecc1970342b8b6c04b769f0fb75d0
author Shyam Jayaraman <bjornick@google.com> 1446241792 -0700
committer Shyam Jayaraman <bjornick@google.com> 1446241792 -0700

Merge branch 'ble' into discovery