Marc Blank 2a5ea1af54 Manually merge change from jb-dev ... Bug: 6479301 Change-Id: I7c2bce9920ede3b03f60c5bf7d02a9152c84941e		2012-05-22 11:40:06 -07:00
assets	Remove empty.html, which isn't used any more.	2010-12-22 11:59:31 -08:00
email2	Manually merge change from jb-dev	2012-05-22 11:40:06 -07:00
emailcommon	Build against the ICS SDK	2012-04-27 12:40:13 -07:00
res	Import translations. DO NOT MERGE	2012-05-15 15:52:33 -07:00
src/com	Set clear_when_task_reset flag on get content intent	2012-04-26 18:48:08 -07:00
tests	Don't use a repeating alarm for AttachmentDownloadService	2012-05-18 14:09:46 -07:00
.classpath
.project
Android.mk	Fix build	2012-04-26 12:33:59 -07:00
AndroidManifest.xml	Revert to old Email app	2012-04-25 13:58:23 -07:00
CleanSpec.mk	Add column for eventual thread topic	2012-04-06 15:32:46 -07:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags	Revert to old Email app	2012-04-25 13:58:23 -07:00
remove-exchange-support.sh	remove-exchange-support.sh supports MacOS	2011-01-28 13:39:39 -08:00