tree 065061422a4b807907dd81bab5a8cebea89bfd8a
parent 3730cd9608cb9c7540a80df84384bd726782348b
parent fc3c9d0e9ec7db80b8e139a5306247908c923ccc
author Jakub Pawlowski <jpawlowski@google.com> 1489001334 +0000
committer android-build-merger <android-build-merger@google.com> 1489001334 +0000

Merge "Bluetooth 5 Advertising API" am: 1bb08c25b8
am: fc3c9d0e9e

Change-Id: Ib8e53386754ccfec27314bc1d29aaabde0cb7976