| commit | 66dc4c2fb7a907135da8e8508c23c69b460f2411 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Jan 10 14:28:56 2013 -0800 |
| committer | Ying Wang <wangying@google.com> | Thu Jan 10 14:28:56 2013 -0800 |
| tree | 5551cb77b2168fd0397fd5ef69314165e8fa5c99 | |
| parent | fc1c1a217b36605c3d613aa5ed5d422990bdd6eb [diff] | |
| parent | 038908a7360c064762de1515a5cd1b662363aeaf [diff] |
resolved conflicts for merge of e016e80c to jb-mr1-dev-plus-aosp Change-Id: Ic1546db5d009307789e0c7fda811982f80655dea
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index 1e66305..0b65c35 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk
@@ -26,6 +26,7 @@ Calendar \ CertInstaller \ DrmProvider \ + Email \ Exchange2 \ FusedLocation \ Gallery2 \
diff --git a/target/product/large_emu_hw.mk b/target/product/large_emu_hw.mk index fffe0f7..8a070b1 100644 --- a/target/product/large_emu_hw.mk +++ b/target/product/large_emu_hw.mk
@@ -27,6 +27,7 @@ Calendar \ CertInstaller \ DrmProvider \ + Email \ Exchange2 \ Gallery2 \ LatinIME \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 6ae4fd9..f7a65db 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk
@@ -20,6 +20,7 @@ PRODUCT_PACKAGES := \ Calculator \ DeskClock \ + Email \ Exchange2 \ FusedLocation \ Gallery \