tree 1ba179c6cca280cdbcc3a34d6204a7f6bdede280
parent c1ed86ab1072fe1f1b0a5ebdc2e9b4c2e8f8675e
parent bc095f035df1f480cfec385712acf441e6223254
author Jakub Pawlowski <jpawlowski@google.com> 1491549276 +0000
committer android-build-merger <android-build-merger@google.com> 1491549276 +0000

Merge "Bluetooth 5 fix default AdvertisingSetParameters values" am: 7bf58d5975 am: 909f3b108f
am: bc095f035d

Change-Id: Iea394761590c392c4401e80ef67bbeecd6b3921a