Commit a6be4e01 authored Jul 15, 2010 by Joe Onorato Committed by Android Git Automerger Jul 15, 2010

am 3a053db2: Merge "The ICU data is no longer compiled directly into the...

am 3a053db2: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread

Merge commit '3a053db2' into gingerbread-plus-aosp

* commit '3a053db2':
  The ICU data is no longer compiled directly into the shared library.

parents d1313da5 3a053db2

core/jni/Android.mk

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -184,7 +184,6 @@ LOCAL_SHARED_LIBRARIES := \
	libssl \		libssl \
	libicuuc \		libicuuc \
	libicui18n \		libicui18n \
	libicudata \
	libmedia \		libmedia \
	libwpa_client \		libwpa_client \
	libjpeg		libjpeg