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)
Change-Id: I342341e24e6cb06bbd6074aec30be0b40a3feeac

1  2 
include/bt_target.h

Simple merge