OSDN Git Service

resolved conflicts for 0b681505 to master
authorPavlin Radoslavov <pavlin@google.com>
Mon, 19 Oct 2015 22:33:07 +0000 (15:33 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Mon, 19 Oct 2015 22:33:07 +0000 (15:33 -0700)
commit31b66eb382955de346428b5fef43b06f77131fce
tree2dedf0ed6acb03ff309eadca1a670c01f26ce338
parent87607e9918a4179047e9e4f27154b54aa11e35ee
parent0b681505a19677ef9b66acd3d56f99716ddaaeb0
resolved conflicts for 0b681505 to master

Change-Id: I342341e24e6cb06bbd6074aec30be0b40a3feeac
include/bt_target.h