The Android Automerger 566ad257a8 am 2ed93592: am 57c0454d: merge in ub-mail-master-release history after reset to a64f39d5a2 ... * commit '2ed93592d772103b1a5c8ff7ee44af37fe15d0cf': Remove deprecated locales		2014-07-24 23:32:52 +00:00
assets	Remove empty.html, which isn't used any more.	2010-12-22 11:59:31 -08:00
emailcommon	Add copyright notice	2014-07-14 12:10:20 -07:00
res	am ae028b6c: Add lower res versions of ic_setup_delete.png	2014-07-24 18:02:49 +00:00
src/com	Add ACCOUNT_ID to ACCOUNT_COLUMNS and populate it with Email from	2014-07-22 11:31:37 +02:00
tests	Rename AccountSettings to EmailPreferenceActivity	2014-07-14 11:44:52 -07:00
.classpath	Initial Contribution	2008-10-21 07:00:00 -07:00
.project	Initial Contribution	2008-10-21 07:00:00 -07:00
Android.mk	Use the prebuilt support library resources	2014-07-16 11:46:01 +02:00
AndroidManifest.xml	Add support for launching setup flow via intent action	2014-07-18 15:35:35 -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	Move over to the new AttachmentService.	2014-06-25 09:56:29 -07:00