Oliver Woodman b5c8595655 Resolve merge conflict

2016-01-15 18:53:30 +00:00

..

src

Resolve merge conflict

2016-01-15 18:53:30 +00:00

build.gradle

Bump version to 1.5.3.

2015-12-08 18:00:46 +00:00