Marc Blank 2a5ea1af54 Manually merge change from jb-dev ... Bug: 6479301 Change-Id: I7c2bce9920ede3b03f60c5bf7d02a9152c84941e		2012-05-22 11:40:06 -07:00
..
assets	Merge email source into email2	2012-03-13 19:10:29 -07:00
emailcommon	Make viewables handling more sensible in MimeUtility	2012-05-21 13:01:46 -07:00
res	Merge "Remove Email2 overrides. Use UnifiedEmail styling." into jb-ub-mail	2012-05-16 15:13:24 -07:00
src/com	Manually merge change from jb-dev	2012-05-22 11:40:06 -07:00
Android.mk	Build against the JB SDK	2012-05-17 16:37:42 -07:00
AndroidManifest.xml	Build against the JB SDK	2012-05-17 16:37:42 -07:00
proguard.flags	Copy Email proguard.flags to email2; add UnifiedEmail flags	2012-03-14 12:10:39 -07:00