NerdNumber9 908128b55d Merge upstream changes

2017-11-29 21:53:02 -05:00

..

src

Merge upstream changes

2017-11-29 21:53:02 -05:00

.gitignore

Upstream merge

2017-05-04 23:38:17 -04:00

build.gradle

Merge upstream changes

2017-11-29 21:53:02 -05:00

proguard-rules.pro

Merge upstream changes

2017-11-29 21:53:02 -05:00

shortcuts.xml

Update Android Studio to 3.0

2017-10-28 14:44:19 +02:00