diff options
| author | Joe Onorato <joeo@android.com> | 2010-07-15 11:31:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 11:31:01 -0700 |
| commit | 58b0f67fe22032f55bf779e2f828b445a475bfd3 (patch) | |
| tree | 432c14366ce8cdda0a9d98dbbe3a5f441dd2f1fb /libnativehelper | |
| parent | 23280a2598d72733223c69a6ff3ab9dd5005c751 (diff) | |
| parent | 1c3da6197c677339cfdd41a948a5f79f804d6e4e (diff) | |
| download | android_dalvik-58b0f67fe22032f55bf779e2f828b445a475bfd3.tar.gz android_dalvik-58b0f67fe22032f55bf779e2f828b445a475bfd3.tar.bz2 android_dalvik-58b0f67fe22032f55bf779e2f828b445a475bfd3.zip | |
am 1c3da619: am 0f0e6f10: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit '1c3da6197c677339cfdd41a948a5f79f804d6e4e'
* commit '1c3da6197c677339cfdd41a948a5f79f804d6e4e':
The ICU data is no longer compiled directly into the shared library.
Diffstat (limited to 'libnativehelper')
| -rw-r--r-- | libnativehelper/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libnativehelper/Android.mk b/libnativehelper/Android.mk index 552f13914..2acc86984 100644 --- a/libnativehelper/Android.mk +++ b/libnativehelper/Android.mk @@ -36,7 +36,6 @@ shared_libraries := \ libutils \ libz \ libcrypto \ - libicudata \ libicuuc \ libicui18n \ libsqlite |