OSDN Git Service

resolved conflicts for merge of 27c4e634 to mnc-dev-plus-aosp
authorAndre Eisenbach <eisenbach@google.com>
Mon, 13 Jul 2015 17:06:52 +0000 (10:06 -0700)
committerAndre Eisenbach <eisenbach@google.com>
Mon, 13 Jul 2015 17:06:52 +0000 (10:06 -0700)
commit59522cee564a6a647d8c49dd15f34d6d21d26560
treec100a6149bb8063d38bc5dd1008388c6bf237a2b
parent8fe49117ed231c02db07a65652ba1daa9148542d
parent27c4e634cb0d6e618bc3e53da7c0f9a305d1593b
resolved conflicts for merge of 27c4e634 to mnc-dev-plus-aosp

Change-Id: Id6d78e484d58042e93e4d4ea34522d15a6e1ba59
btif/src/btif_dm.c
device/src/interop.c