Andy Stadler 49fac404e4 resolved conflicts for merge of 7af8cc5e to master ... Change-Id: Ie7364895effcf63b0716682fe6ac24926d1e1da1		2010-11-19 18:46:39 -08:00
..
account_preferences.xml	Use AccountManager for POP/IMAP; refactor setup classes	2010-07-21 19:01:41 -07:00
account_settings_preferences.xml	Hide vibrate notification option on no-vibrate devices	2010-11-04 21:13:45 -07:00
authenticator_alternate.xml	Change EAS authenticator's label according to the vendor policy.	2010-02-02 16:25:29 -08:00
device_admin.xml	Move DeviceAdmin APIs to android.app.admin.	2010-02-26 23:31:37 -08:00
eas_authenticator.xml	Use AccountManager for POP/IMAP; refactor setup classes	2010-07-21 19:01:41 -07:00
general_preferences.xml	Implement text zoom for Message View	2010-11-02 14:58:24 -07:00
pop_imap_authenticator.xml	Use AccountManager for POP/IMAP; refactor setup classes	2010-07-21 19:01:41 -07:00
providers_product.xml
providers.xml	resolved conflicts for merge of 7af8cc5e to master	2010-11-19 18:46:39 -08:00
senders_product.xml
senders.xml	Clean up handling of Exchange setup option	2009-09-02 09:45:28 -07:00
stores_product.xml
stores.xml	Clean up handling of Exchange setup option	2009-09-02 09:45:28 -07:00
syncadapter_calendar.xml	Implement Exchange calendar sync support	2010-01-28 09:18:48 -08:00
syncadapter_contacts.xml
syncadapter_email.xml	Use AccountManager for POP/IMAP; refactor setup classes	2010-07-21 19:01:41 -07:00
syncadapter_pop_imap.xml	Use AccountManager for POP/IMAP; refactor setup classes	2010-07-21 19:01:41 -07:00