Dominik Schürmann 9f9aa79066 Fix conflicts

2014-07-30 01:07:10 +02:00

..

src/main

Fix conflicts

2014-07-30 01:07:10 +02:00

.gitignore

Fix gitignore for lint

2014-04-09 16:36:28 +02:00

build.gradle

Merge branch 'master' into ditch-appmsg

2014-07-26 23:06:32 +02:00