commit d29c99087466ed14ace7901c85d4977cfbd9fd52
author Nick Pelly <npelly@google.com> Fri Oct 22 09:17:41 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 22 09:17:41 2010 -0700
tree d34e60a1526d07d90d13e07bd40c1a7328adc4e3
parent 4c918335ef6ac44530bfefa33860a4e0b23b523c
parent c81ec79d1f88ae8a80e08560a56845655a74f67e

am c81ec79d: am 0592832c: Merge "Attempt to fix simulator build." into gingerbread

Merge commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e'

* commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e':
  Attempt to fix simulator build.

core/jni/android_nfc_NdefMessage.cpp

diff --git a/core/jni/android_nfc_NdefMessage.cpp b/core/jni/android_nfc_NdefMessage.cpp
index 99295f4..eaf989d 100644
--- a/core/jni/android_nfc_NdefMessage.cpp
+++ b/core/jni/android_nfc_NdefMessage.cpp
@@ -16,6 +16,8 @@
 
 #define LOG_TAG "NdefMessage"
 
+#include <stdlib.h>
+
 #include "jni.h"
 #include "JNIHelp.h"
 

core/jni/android_nfc_NdefRecord.cpp

diff --git a/core/jni/android_nfc_NdefRecord.cpp b/core/jni/android_nfc_NdefRecord.cpp
index 9d20d6d..0a3a519 100644
--- a/core/jni/android_nfc_NdefRecord.cpp
+++ b/core/jni/android_nfc_NdefRecord.cpp
@@ -16,6 +16,8 @@
 
 #define LOG_TAG "NdefRecord"
 
+#include <stdlib.h>
+
 #include "jni.h"
 #include "JNIHelp.h"