OSDN Git Service

resolved conflicts for merge of f4471c7e to klp-modular-dev
authorMatthew Xie <mattx@google.com>
Mon, 24 Mar 2014 19:37:40 +0000 (12:37 -0700)
committerMatthew Xie <mattx@google.com>
Mon, 24 Mar 2014 19:37:40 +0000 (12:37 -0700)
commit335a8a6c08abfbea29dead003b4fa95fca786ccd
tree2a3a9de303392f01a8bc2c5d5c0dceb567b8ca0a
parent6746717209435aac27eedeebdf67da1a1fbc5e5a
parentf4471c7e6ca7a0bd4846b2fe4fbe78d79ef37b81
resolved conflicts for merge of f4471c7e to klp-modular-dev

Change-Id: I89ce6df8f59efa8cee63775eff58262ecf438db3
stack/btm/btm_ble_gap.c
stack/btm/btm_int.h