Brad Leege b90571107d [android] #5291 - Fixing merge conflicts

2016-06-09 14:35:10 -05:00

..

src/main

[android] #5291 - Fixing merge conflicts

2016-06-09 14:35:10 -05:00

build.gradle

[android] #5131 - update okhttp dependency

2016-05-25 14:09:50 +02:00

deploy.sh

…

gradle.properties

[android] #5284 - Restoring 4.1.0-SNAPSHOT version

2016-06-08 17:12:28 -05:00

lint.xml

…

proguard-rules.pro

…