Mindy Pereira d0e7f538cb resolved conflicts for merge of 565e94cd to master ... Change-Id: I424541a5c8d1d74b78e19170e40edb071fa68c0e		2011-11-02 10:47:25 -07:00
assets	Remove empty.html, which isn't used any more.	2010-12-22 11:59:31 -08:00
emailcommon	am 483f4927: Merge "Add utility to determine if account can\'t auto-sync due to roaming" into ics-mr1	2011-11-02 17:31:48 +00:00
res	resolved conflicts for merge of f4d30527 to master	2011-11-02 10:36:02 -07:00
src/com	resolved conflicts for merge of 565e94cd to master	2011-11-02 10:47:25 -07:00
tests	Rewrite of security policy handling and service code	2011-10-25 10:32:34 -07:00
.classpath
.project
Android.mk	Fix build break	2011-11-01 16:13:45 -07:00
AndroidManifest.xml	Up Email version for release.	2011-10-10 11:38:16 -07:00
CleanSpec.mk	Unused assets removed from Email	2011-10-21 09:10:27 -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 more useless code	2011-06-29 14:07:25 -07:00
remove-exchange-support.sh	remove-exchange-support.sh supports MacOS	2011-01-28 13:39:39 -08:00