1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-14 21:45:14 -05:00
k-9/src/com/fsck/k9
cketti 601e2880ac Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/com/fsck/k9/mail/transport/SmtpTransport.java
2014-09-12 07:11:32 +02:00
..
activity Merge remote-tracking branch 'upstream/master' 2014-09-12 07:11:32 +02:00
cache Extracted LocalFolder and LocalMessage definition from LocalStore 2014-09-11 20:26:40 +02:00
controller Extracted LocalFolder and LocalMessage definition from LocalStore 2014-09-11 20:26:40 +02:00
crypto Remove ActionBarSherlock 2014-06-21 17:09:45 +02:00
fragment Extracted LocalFolder and LocalMessage definition from LocalStore 2014-09-11 20:26:40 +02:00
helper Eliminate DomainNameChecker 2014-09-06 19:32:03 -04:00
mail Merge remote-tracking branch 'upstream/master' 2014-09-12 07:11:32 +02:00
net/ssl Re-enable TLSv1.1/1.2 support 2014-09-10 11:42:14 -04:00
preferences Remove gallery bug work-around 2014-09-07 23:35:18 +02:00
provider Extracted LocalFolder and LocalMessage definition from LocalStore 2014-09-11 20:26:40 +02:00
remotecontrol Eliminate obsolete background data sync option 2014-08-19 17:14:44 -04:00
search Extracted LocalFolder and LocalMessage definition from LocalStore 2014-09-11 20:26:40 +02:00
security Move KeyChainKeyManager 2014-08-11 11:08:24 -04:00
service Eliminate obsolete background data sync option 2014-08-19 17:14:44 -04:00
view Merge remote-tracking branch 'upstream/master' 2014-09-12 07:11:32 +02:00
Account.java Merge remote-tracking branch 'upstream/master' 2014-09-12 07:11:32 +02:00
AccountStats.java Grey out unavailable accounts. 2011-03-19 12:36:58 -05:00
BaseAccount.java astyle-d 2011-02-26 18:39:06 -06:00
Clock.java Move AOSP files. 2013-11-05 16:26:27 -05:00
EmailAddressAdapter.java Don't use EmailAddressAdapter as singleton 2012-04-11 03:26:45 +02:00
EmailAddressValidator.java astyle-d 2011-02-26 18:39:06 -06:00
FontSizes.java Remove old setting for message content font size 2014-02-13 04:22:45 +01:00
Identity.java astyle-d 2011-02-26 18:39:06 -06:00
K9.java Merge remote-tracking branch 'upstream/master' 2014-09-12 07:11:32 +02:00
NotificationSetting.java astyle-d 2011-02-26 18:39:06 -06:00
Preferences.java Eliminate the need to pass a context to LocalKeyStore.getInstance 2013-12-03 19:24:37 -05:00
PRNGFixes.java Some assorted warning fixes. 2013-09-25 15:20:43 +02:00
Throttle.java Move AOSP files. 2013-11-05 16:26:27 -05:00