Paul Westbrook 9a920fd979 resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp ... Change-Id: I877043f64b96b9073652f7cec90bff08dd6e69f5		2014-11-02 11:10:17 -08:00
assets
emailcommon	Merge "Add analytics to track of what cipher suites are being used" into ub-gmail-ur14-dev	2014-10-24 19:34:10 +00:00
provider_src/com/android/email	Add additional analytics regarding our SSLSockets	2014-10-24 14:46:33 -07:00
res	resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp	2014-11-02 11:10:17 -08:00
src/com	Default to encrypted connections (YAY!)	2014-10-24 15:35:46 -07:00
tests	Old paper clip asset is removed, which touches a test case here.	2014-09-22 14:00:00 -07:00
.classpath
.project
Android.mk	Changes to support smaller email tombstone apk size	2014-09-16 13:59:07 -07:00
AndroidManifest.xml	EmailProvider now supports query and getType for cached file urls	2014-10-10 11:17:52 -07:00
CleanSpec.mk
MODULE_LICENSE_APACHE2
NOTICE
proguard-test.flags	Fix proguard rule	2014-08-06 00:41:47 -07:00
proguard.flags	Prevent AccountSettingsFragment from being stripped	2014-09-17 10:20:17 -07:00