Baligh Uddin ce660a6ebb am e19bbf38: (-s ours) am ee7eda0c: (-s ours) am 7e1932f7: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev automerge: 67995a4 -s ours ... * commit 'e19bbf3815b3f244f7ebee58ccc1371deca83d13': Import translations. DO NOT MERGE		2014-11-02 17:44:05 +00:00
assets
emailcommon	b/17135753. Make sure to free ServiceConnection.	2014-08-20 14:08:47 -07:00
res	Import translations. DO NOT MERGE	2014-09-08 10:31:49 -07:00
src/com	Match dup accounts against all accounts, not just Email	2014-08-21 22:12:26 +00:00
tests	Clean up proguard test flags file	2014-08-01 16:44:56 -07:00
.classpath
.project
Android.mk	Use appcompat photoviewer.	2014-08-19 13:57:33 -07:00
AndroidManifest.xml	Fix FolderSelectionActivity Issue (Widget)	2014-08-15 17:19:44 -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