tree b1d9e93e543541e81e9f4da31e19548fb55ca905
parent 30e9c9c97350b8da2b27f211a0d0bbb5ec720cf3
parent 766addf837d31efa3d60c7850cc81de7bfa40cf2
author Android Build Merger (Role) <android-build-merger@google.com> 1503012368 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1503012368 +0000

Merge "Merge "Bluetooth: Fix startAdvertisingSet error handling" am: ed12213b59 am: e9fe99571b am: 94cd5b22c1 am: b77581725f" into oc-mr1-dev-plus-aosp