resolved conflicts for merge of 9b7ebf5d to master

Change-Id: I0dfbc70b4b52a69ba43f14def4203ece8d9c9090
This commit is contained in:
Chung-yih Wang 2010-08-06 10:43:45 +08:00
commit 2d9798cf88

View file

@ -89,6 +89,7 @@ FRAMEWORKS_BASE_SUBDIRS := \
vpn \ vpn \
keystore \ keystore \
icu4j \ icu4j \
voip \
) )
# #