From: Andre Eisenbach <eisenbach@google.com>
Date: Wed, 7 Oct 2015 21:10:25 +0000 (-0700)
Subject: resolved conflicts for 955abac9 to master
X-Git-Tag: android-x86-7.1-r1~672
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=977040e8062e641b9c20a0ae1862f9cccd6553ee;p=android-x86%2Fsystem-bt.git

resolved conflicts for 955abac9 to master

Change-Id: If3f90984c5ca906bab2fd6df7d77b4dfec47115e
---

977040e8062e641b9c20a0ae1862f9cccd6553ee
diff --cc osi/include/eager_reader.h
index 542df45a7,a172f06e8..49fe94877
--- a/osi/include/eager_reader.h
+++ b/osi/include/eager_reader.h
@@@ -22,7 -22,8 +22,8 @@@
  #include <stddef.h>
  #include <stdint.h>
  
 -#include "allocator.h"
 +#include "osi/include/allocator.h"
+ #include "osi/include/thread.h"
  
  typedef struct eager_reader_t eager_reader_t;
  typedef struct reactor_t reactor_t;