OSDN Git Service

resolve merge conflicts of 32d6669 to nyc-dev-plus-aosp
authorAndre Eisenbach <eisenbach@google.com>
Wed, 1 Jun 2016 06:02:39 +0000 (23:02 -0700)
committerAndre Eisenbach <eisenbach@google.com>
Wed, 1 Jun 2016 06:02:39 +0000 (23:02 -0700)
commit4cd0416bdfcf6d55a8f1d615d8177f486d326dee
tree85cb6e389f00f1693c926a848fcd709fc997c175
parentbd610187bf0c277c226305c94df17657087d74df
parent32d66694e9f782a0e9dfa423015284a573f8975c
resolve merge conflicts of 32d6669 to nyc-dev-plus-aosp

Change-Id: I949ead7d023a70561ab498c9772e8abbe17a01a6
btif/co/bta_hh_co.cc