tree 2321c7ad786e37932fd3856e8719747959c8d4a1
parent f067f2d362d6b9fdd59033f3895f3fcc131de945
parent 8050837e01254b698664a1656b724398e1cbf848
author Petri Gynther <pgynther@google.com> 1403653871 -0700
committer Petri Gynther <pgynther@google.com> 1403718875 -0700

Merge BlueZ 5.20 into master

Change-Id: I2d69df1b233a4e0135fd5137bc792a7040897f2a