resolved conflicts for merge of 9b7ebf5d to master

Change-Id: I0dfbc70b4b52a69ba43f14def4203ece8d9c9090
2010-08-06 10:43:45 +08:00 · 2010-08-06 10:43:45 +08:00 · 2d9798cf88
commit 2d9798cf88
parent 6d98f5f4d6 9b7ebf5dbd
1 changed files with 1 additions and 0 deletions
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@ -89,6 +89,7 @@ FRAMEWORKS_BASE_SUBDIRS := \
 	    vpn \
 	    keystore \
 	    icu4j \
+	    voip \
 	 )

 #