commit b81bc6842e6743e548a76a1c2f2ac59b4f080b10
author Jean-Baptiste Queru <jbq@google.com> Tue Jan 08 08:13:50 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 08 08:13:50 2013 -0800
tree 4fb248ecbe53ea857693ff1de3cb2e6be78f43cb
parent d01d0bf86c2309a7a950549c9c124b303c0c3f82
parent 7a184cb70f7fbdf7f9f64b88338dcd155cfe1e3d

am 7a184cb7: Merge "Change Email2 reference back to Email"

* commit '7a184cb70f7fbdf7f9f64b88338dcd155cfe1e3d':
  Change Email2 reference back to Email

target/product/generic_no_telephony.mk

diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index f139cbd..5bdc596 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -26,7 +26,7 @@
     Calendar \
     CertInstaller \
     DrmProvider \
-    Email2 \
+    Email \
     Exchange2 \
     FusedLocation \
     Gallery2 \

target/product/large_emu_hw.mk

diff --git a/target/product/large_emu_hw.mk b/target/product/large_emu_hw.mk
index 27ebc96..8a070b1 100644
--- a/target/product/large_emu_hw.mk
+++ b/target/product/large_emu_hw.mk
@@ -27,7 +27,7 @@
     Calendar \
     CertInstaller \
     DrmProvider \
-    Email2 \
+    Email \
     Exchange2 \
     Gallery2 \
     LatinIME \

target/product/sdk.mk

diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 287c7bf..f7a65db 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -20,7 +20,7 @@
 PRODUCT_PACKAGES := \
 	Calculator \
 	DeskClock \
-	Email2 \
+	Email \
 	Exchange2 \
 	FusedLocation \
 	Gallery \