OSDN Git Service

resolve merge conflicts of 760fb7083b to master.
authorAndre Eisenbach <eisenbach@google.com>
Fri, 15 Jan 2016 20:23:15 +0000 (12:23 -0800)
committerAndre Eisenbach <eisenbach@google.com>
Fri, 15 Jan 2016 20:23:42 +0000 (12:23 -0800)
commitb08988a53cf6fbb20460debded25cf6f2af66728
tree2441ffde0ee4d6d52de6e6d06fe63318fc63c4f8
parent1e7f85eaf19a877305aaa1c57c2ac23c20e5ceeb
parent760fb7083b1781c9519fb6a36e46d7ab5d5efb30
resolve merge conflicts of 760fb7083b to master.

Change-Id: Ic5d10e4a80d53f916ec61e75d01a0e08df6114cf
btif/src/btif_rc.c