The Android Automerger 8a44b92af3 am 2e8400c2: merge in master-release history after reset to 1f2c8cd7c3 ... * commit '2e8400c21174af2955ca3e4cf7c8035d4a0830d7': Fix URI comparison Revert "email: add support for Server Name Indication (SNI)"		2014-06-06 15:41:57 +00:00
assets	Remove empty.html, which isn't used any more.	2010-12-22 11:59:31 -08:00
emailcommon	am b2cbd6e4: Merge "Revert "email: add support for Server Name Indication (SNI)""	2014-04-01 20:39:29 +00:00
emailsync	Remove mAmAccount from the email provider account object	2013-10-04 10:21:25 -07:00
res	Import translations. DO NOT MERGE	2014-06-02 14:31:35 -07:00
src/com	Fix URI comparison	2014-05-14 18:34:45 +00:00
tests	Get Email units to compile in mr2 branch	2014-02-27 15:04:34 -08:00
.classpath
.project
Android.mk	Point to new chips location	2014-03-26 13:49:25 -07:00
AndroidManifest.xml	Increment email versioncode.	2014-03-14 11:26:21 -07:00
CleanSpec.mk	Remove unused resource directories	2013-09-06 10:23:02 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00
NOTICE	auto import from //depot/cupcake/@135843	2009-03-03 19:32:22 -08:00
proguard.flags	Remove nonexistant classes and update existing ones	2013-01-30 14:20:58 -08:00