The Android Automerger 49f75bb496 merge in ics-release history after reset to master		2011-08-30 12:45:52 -07:00
assets	Remove empty.html, which isn't used any more.	2010-12-22 11:59:31 -08:00
emailcommon	Restore return statement erroneously deleted earlier	2011-08-24 17:14:07 -07:00
res	Import revised translations.	2011-08-26 14:55:31 -07:00
src/com	Merge "Be careful before setting account's delete policy"	2011-08-26 18:43:34 -07:00
tests	Fix unit tests.	2011-08-24 10:24:42 -07:00
.classpath
.project
Android.mk	Integrate chips into Email.	2011-06-16 17:41:04 -07:00
AndroidManifest.xml	Revert "Make compose landscape(phone) go fullscreen"	2011-08-17 11:13:07 -07:00
CleanSpec.mk	Step 2 in 7" support for tablets.	2011-05-25 15:44:41 -07:00
MODULE_LICENSE_APACHE2
NOTICE
proguard.flags	Remove more useless code	2011-06-29 14:07:25 -07:00
remove-exchange-support.sh	remove-exchange-support.sh supports MacOS	2011-01-28 13:39:39 -08:00