The Android Automerger 56391f6375 am 5a9c5750: merge in ub-mail-master-release history after reset to 5c93d36616 ... * commit '5a9c5750bc1221c01846470411abd56f58b39914': Upgrade my logging from .e to .wtf Add logging to help track down a bug causing invalid credentials Increase touch target for adding authentication Fix a NPE trying to download an attachment Actually install the correct views when credentials fragment is in standalone mode Update Email major version number to 6.3 so that it matches EmailGoogle Update version Fix temporary setup flow on tablets Fix a crash bringing up settings		2014-07-16 19:18:00 +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 6cf6b5c2: Merge "Remove direct entry points to AccountSettings" into ub-mail-master	2014-07-16 19:17:54 +00:00
src/com	am 6f747eb7: Unify general settings	2014-07-16 19:17:14 +00: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	Replace all references to UnifiedEmail's com.android.oldbitmap with	2014-07-11 14:24:42 -07:00
AndroidManifest.xml	Rename AccountSettings to EmailPreferenceActivity	2014-07-14 11:44:52 -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