tree 877cadbd0365be4da8a29a924695b6b2610fef97
parent a72dc1fe6fa1ba681655efc474d11f7bbcfffc5d
parent fe8465217c9be590240f98bcaf2bdae4f3363b9a
author Jakub Pawlowski <jpawlowski@google.com> 1496432670 +0000
committer android-build-merger <android-build-merger@google.com> 1496432670 +0000

Merge "Fix OnAdvertisingSetStopped callback not being called" am: f9d9bf4199 am: d57765298d
am: fe8465217c

Change-Id: Ie797e01689155a65a49e7a66e7a4c8409f3db3a8