Tom Hacohen 536bef9815 Import: always import, don't try to find duplicates based on UID. ... This was causing issues when importing from a Google account in some cases because we were getting weird UIDs. This was also problematic when importing from other sources that reported weird UIDs.		2018-01-22 16:40:48 +00:00
..
src	Import: always import, don't try to find duplicates based on UID.	2018-01-22 16:40:48 +00:00
.gitignore
build.gradle	Properly switch to kapt2 as the annotation processor	2018-01-22 13:49:57 +00:00
lint.xml
proguard-rules.txt	Rename the Android package to EteSync	2017-02-27 13:23:24 +00:00