commit | b903f9465d0db517aad37548e47b071059edb200 | [log] [tgz] |
---|---|---|
author | Jakub Pawlowski <jpawlowski@google.com> | Fri Dec 02 22:25:16 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Dec 02 22:25:16 2016 +0000 |
tree | 88266f3eb0caa993babe2232b7915ea43a18ec37 | |
parent | fae9f6e8f34ea12209e8c40964ed5cbff5d02e37 [diff] | |
parent | 70093bc29a3ed6e21744c5684e64a4b92ae2757d [diff] |
Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev am: c977c776c2 am: 70093bc29a Change-Id: Ic24b66e7d17a6595c084eaa16a01818c810ca201