tree 063c7134bb463a91f1a16dc819a6a30e724cc1e1
parent c6dd74a09685204ac19be2116aa013a1163c9710
parent 31595b3156ece8ffde45cb86c2f5d65df099cbbf
author Zach Johnson <zachoverflow@google.com> 1521842385 +0000
committer android-build-merger <android-build-merger@google.com> 1521842385 +0000

Merge "Revert "Bluetooth: preserve one advertisement slot for GMS core"" into pi-dev am: 5bdf063537
am: 31595b3156

Change-Id: I186a9aafc85d7fc74e7eaef259416552a974d6c3