am 09a68ba3: Add remaining retry count to response for PIN/PUK commands.

Merge commit '09a68ba315ca3d6b092fd8078cc42b93b7934a1a'

* commit '09a68ba315ca3d6b092fd8078cc42b93b7934a1a':
  Add remaining retry count to response for PIN/PUK commands.

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 e3bf53f..1cf1ef5 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>