tree 82b866d7423c28354a16bdfce7dc3fe61f206347
parent ad564717884f3d4f245ef5b65998bf4653f46296
parent 5328ce0a949d11556bd679cd4f3ac919643e7753
author Shyam Jayaraman <bjornick@google.com> 1446241655 -0700
committer Shyam Jayaraman <bjornick@google.com> 1446241655 -0700

Merge branch 'ble' into discovery