James Lemieux 91d415ef4c am f247d7e0: am 417c1ded: am c909ad16: am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev ... * commit 'f247d7e02e4aae32698256a5776f19760d27b0ea': Combined view should also display client-side sanitized HTML		2014-11-02 19:02:44 +00:00
assets	Remove empty.html, which isn't used any more.	2010-12-22 11:59:31 -08:00
emailcommon	Display sync errors using snackbar and not as a TL footer	2014-09-29 17:51:27 -07:00
provider_src/com/android/email	Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev	2014-09-30 23:11:37 +00:00
res	am 5d9a2f3d: am c097bb3d: am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar	2014-11-02 19:02:38 +00:00
src/com	Add ability to clear migration state to debug screen	2014-09-24 11:48: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	Switch to targetSdkVersion=21. b/16408109	2014-09-15 13:16:44 -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-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