resolved conflicts for merge of 0f085e5a to gingerbread-plus-aosp

Change-Id: If89721a5ee86b9ce27a2235ecd75f3eceec7def7
This commit is contained in:
Jean-Baptiste Queru 2010-10-07 15:00:12 -07:00
commit 424de1779d
1 changed files with 1 additions and 0 deletions

View File

@ -41,6 +41,7 @@ PRODUCT_PACKAGES := \
framework-res \
hprof-conv \
icu.dat \
ip-up-vpn \
jasmin \
jasmin.jar \
libcrypto \