OSDN Git Service

Merge "Bluetooth 5 periodc scan API (1/2)" am: f1d76a71c8 am: 8acd7391bd
authorJakub Pawlowski <jpawlowski@google.com>
Wed, 8 Mar 2017 19:35:27 +0000 (19:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Mar 2017 19:35:27 +0000 (19:35 +0000)
am: 600a67a8c8  -s ours

Change-Id: Ibc1fc04aa569bb641a006b490ebf8450480b00ed


Trivial merge