tree 561b8f6f7704f60188251def996b0fa611ad5bc7
parent 0d6004a733df9b7d2becb0902f14d24392edd953
parent d22e497bf941e39d5f6aad99aa751199f0740dc7
author Shyam Jayaraman <bjornick@google.com> 1446242712 -0700
committer Shyam Jayaraman <bjornick@google.com> 1446242712 -0700

Merge branch 'ble' into discovery

Change-Id: Ifd34c03eba21fd4738940f64e7624a5edbddd9ed