OSDN Git Service

Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev
authorJakub Pawlowski <jpawlowski@google.com>
Fri, 2 Dec 2016 22:34:26 +0000 (22:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 22:34:26 +0000 (22:34 +0000)
am: 68566424db

Change-Id: I986cf56726bea520455cd5a82ad969b637b6e54a


Trivial merge