Joe Bowser 43956c1bc8 Merge branch 'master' into StudioProjectCompat ...

Fixing conflict caused by merging #417 into master

2017-11-20 18:21:49 -08:00

..

build.gradle

Merge branch 'master' into StudioProjectCompat

2017-11-20 18:21:49 -08:00