Joe Steele 1783dd1a63 Merge branch 'master' into tls-client-cert-auth ... Conflicts: res/layout/account_setup_basics.xml res/values/strings.xml src/com/fsck/k9/activity/setup/AccountSetupBasics.java		2014-08-19 16:19:02 -04:00
..
arrays.xml	Remove unused resources	2014-04-07 19:52:37 +02:00
attrs.xml	Change message body font size with slider, using new setTextZoom() WebView API, from 40% to 250%	2014-01-31 23:09:25 +02:00
colors.xml	New OpenPGP Provider API	2014-03-02 16:51:47 +01:00
constants.xml	Extracted some strings to constants.xml	2012-04-23 15:05:29 +00:00
dimensions.xml	Remove unused resources	2014-04-07 19:52:37 +02:00
ids.xml	Remove SslHelper.isClientCertificateSupportAvailable()	2014-08-11 11:07:42 -04:00
strings.xml	Merge branch 'master' into tls-client-cert-auth	2014-08-19 16:19:02 -04:00
styles.xml	Fix SpUsage lint warnings	2014-04-07 20:09:22 +02:00
themes.xml	Remove ActionBarSherlock	2014-06-21 17:09:45 +02:00