Andy Wilkinson 426435f4af Merge branch '1.4.x' into 1.5.x

2017-01-13 15:40:11 -05:00

..

src/checkstyle

Correct copyright dates and enforce that starting year is 2012

2017-01-13 15:36:06 -05:00

pom.xml

Migrate to android-json

2017-01-04 23:00:06 -08:00