Paul Westbrook 6666fbf090 resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp ... Change-Id: I28a5355b850c271bdead47874d586c557e4557f6		2014-11-02 10:49:50 -08:00
assets	Remove empty.html, which isn't used any more.	2010-12-22 11:59:31 -08:00
emailcommon	Put debug screen back into settings	2014-08-28 11:53:51 -07:00
res	resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp	2014-11-02 10:49:50 -08:00
src/com	Merge "Remove unused resources" into ub-gmail-ur14-dev	2014-09-10 16:49:02 +00:00
tests	Remove unused resources	2014-09-10 03:24:53 -07:00
.classpath
.project
Android.mk	Use appcompat photoviewer.	2014-08-19 13:57:33 -07:00
AndroidManifest.xml	Remove unused resources	2014-09-10 03:24:53 -07:00
CleanSpec.mk	Remove unused resource directories	2013-09-06 10:23:02 -07:00
MODULE_LICENSE_APACHE2
NOTICE
proguard-test.flags	Fix proguard rule	2014-08-06 00:41:47 -07:00
proguard.flags	Use test proguard config for eng builds	2014-08-01 11:08:18 -07:00