OSDN Git Service

resolve merge conflicts of 15a5c3f852 to mnc-dr-dev-plus-aosp.
authorAndre Eisenbach <eisenbach@google.com>
Wed, 21 Oct 2015 02:15:52 +0000 (19:15 -0700)
committerAndre Eisenbach <eisenbach@google.com>
Wed, 21 Oct 2015 02:15:52 +0000 (19:15 -0700)
commitdfed8a623c98c4f0134dc82d96ed877976cfecfe
tree06a994581c5c68eec86390d8c0dbd702801caf3b
parent82a9e6f366e75f884c838dc51a9ae011335704f5
parent15a5c3f85252ac30c07b5559f963ef6e1e741487
resolve merge conflicts of 15a5c3f852 to mnc-dr-dev-plus-aosp.

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