From 2127d4dd096408ae3a31278f90b2d90c17a41d97 Mon Sep 17 00:00:00 2001
From: Paul Westbrook <pwestbro@google.com>
Date: Thu, 15 Aug 2013 18:12:40 -0700
Subject: [PATCH] Use name "Email" instead of Email2

cherry-pick of https://googleplex-android-review.googlesource.com/#/c/344210/1
Change-Id: I67e8f1b46e708b65934c794f7df107138f84c7c9
---
 Android.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index 4a9be0664..469d9de52 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,8 +45,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon com.androi
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
 
-LOCAL_PACKAGE_NAME := Email2
-LOCAL_OVERRIDES_PACKAGES := Email
+LOCAL_PACKAGE_NAME := Email
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(unified_email_dir)/proguard.flags