tree 92129bcf84282a9864a8d20d845b0580e7ecbedb
parent 7954cfe6f1b61ac8add94ae057e0c3ebdc51cb05
parent d81df46e80d5957dd50aed5021a2329836079ab5
author Jakub Pawlowski <jpawlowski@google.com> 1478909479 +0000
committer android-build-merger <android-build-merger@google.com> 1478909479 +0000

Merge "Bluetooth: advertising improvements" am: 82c9ba9c55 am: e3b71cd572
am: d81df46e80

Change-Id: I7e17eac0305832d69366b565427ec048a7166357