commit b4e2706fdd9efe7516e23f2367b331d1aae31717
author Jean-Baptiste Queru <jbq@google.com> Tue Aug 04 09:00:28 2009 -0700
committer Jean-Baptiste Queru <jbq@google.com> Tue Aug 04 09:00:28 2009 -0700
tree f9fcc869a4afe8d408a59cde687604b8de58d958
parent 107e779838cd86b6de16fe858b53ac00fff572b6
parent bcf8ffa1a87d91ea60fe0a536e88be1b71bdfb18

merge from open-source master

libril/Android.mk

diff --git a/libril/Android.mk b/libril/Android.mk
index ce3efff..cba6c88 100644
--- a/libril/Android.mk
+++ b/libril/Android.mk
@@ -9,6 +9,7 @@
 
 LOCAL_SHARED_LIBRARIES := \
     libutils \
+    libbinder \
     libcutils \
     libhardware_legacy
 

libril/ril.cpp

diff --git a/libril/ril.cpp b/libril/ril.cpp
index e3bf53f..1cf1ef5 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -27,7 +27,7 @@
 #include <utils/Log.h>
 #include <utils/SystemClock.h>
 #include <pthread.h>
-#include <utils/Parcel.h>
+#include <binder/Parcel.h>
 #include <cutils/jstring.h>
 
 #include <sys/types.h>