diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-08-06 10:43:45 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2010-08-06 10:48:53 +0800 |
| commit | 2d9798cf883e09a5972070542e79e87768f0f9b7 (patch) | |
| tree | 6383402b7e571ebe3fcca6a2cf03e5336a2c7ceb /core/pathmap.mk | |
| parent | 6d98f5f4d6a25b03c7322ed596ab377ef65cf1fd (diff) | |
| parent | 9b7ebf5dbd34634a0ea6815c0738df767045224d (diff) | |
| download | build-2d9798cf883e09a5972070542e79e87768f0f9b7.zip build-2d9798cf883e09a5972070542e79e87768f0f9b7.tar.gz build-2d9798cf883e09a5972070542e79e87768f0f9b7.tar.bz2 | |
resolved conflicts for merge of 9b7ebf5d to master
Change-Id: I0dfbc70b4b52a69ba43f14def4203ece8d9c9090
Diffstat (limited to 'core/pathmap.mk')
| -rw-r--r-- | core/pathmap.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/pathmap.mk b/core/pathmap.mk index b97e622..eae48af 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -89,6 +89,7 @@ FRAMEWORKS_BASE_SUBDIRS := \ vpn \ keystore \ icu4j \ + voip \ ) # |