diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-22 09:03:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-22 09:03:21 -0700 |
| commit | c81ec79d1f88ae8a80e08560a56845655a74f67e (patch) | |
| tree | 6772f22681eff7ba23e47dd49f5d12beb17d5168 /core/jni | |
| parent | d78c8d8bb9516878eb5042a28d76bd6bcf4c6780 (diff) | |
| parent | 0592832c5e61b9c0008a4410f263ea0b0b991f05 (diff) | |
| download | frameworks_base-c81ec79d1f88ae8a80e08560a56845655a74f67e.zip frameworks_base-c81ec79d1f88ae8a80e08560a56845655a74f67e.tar.gz frameworks_base-c81ec79d1f88ae8a80e08560a56845655a74f67e.tar.bz2 | |
am 0592832c: Merge "Attempt to fix simulator build." into gingerbread
Merge commit '0592832c5e61b9c0008a4410f263ea0b0b991f05' into gingerbread-plus-aosp
* commit '0592832c5e61b9c0008a4410f263ea0b0b991f05':
Attempt to fix simulator build.
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_nfc_NdefMessage.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_nfc_NdefRecord.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
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" 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" |