am 7f856808: Cleanup whitespace.

Merge commit '7f8568086f2ea14885b0091c793e14c2656f0da2'

* commit '7f8568086f2ea14885b0091c793e14c2656f0da2':
  Cleanup whitespace.

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

diff --git a/libril/ril.cpp b/libril/ril.cpp
index fae17ca..d695824 100644 (file)
--- 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>