OSDN Git Service

resolved conflicts for ae0d983d to mnc-dr-dev-plus-aosp
authorAndre Eisenbach <eisenbach@google.com>
Fri, 25 Sep 2015 18:02:52 +0000 (11:02 -0700)
committerAndre Eisenbach <eisenbach@google.com>
Fri, 25 Sep 2015 18:02:52 +0000 (11:02 -0700)
commit972a870b103fbf7ce7bf4da22416fde401b23a51
tree9c9fb6ab14622235915132ce93521453fe99011b
parentb71e5484fc33954bd68c7fc2357a91f841fc8fc1
parentae0d983d6cf345723616351fafabdf75ea704ea2
resolved conflicts for ae0d983d to mnc-dr-dev-plus-aosp

Change-Id: Ia701519a512273989c8ab3b9224242d5b4164603
btif/src/btif_pan.c