Jarrad ce6ebde8b7 fix conflicts ... Former-commit-id: 804683cd52		2016-06-08 13:06:58 +02:00
..
app	fix conflicts	2016-06-08 13:06:58 +02:00
gradle/wrapper	Initial	2016-02-23 01:04:42 +03:00
build.gradle	fix android-geth dependency	2016-04-22 19:04:29 +03:00
gradle.properties	Initial	2016-02-23 01:04:42 +03:00
gradlew	Initial	2016-02-23 01:04:42 +03:00
gradlew.bat	Initial	2016-02-23 01:04:42 +03:00
settings.gradle	Merge remote-tracking branch 'origin/develop' into real-data. Fix contacts synchronization.	2016-05-24 11:08:54 +03:00