Peter Serwylo 0e5c039536 Merge branch 'master' into new-swap ...

Fixed lots of (minor) conflicts. Some due to earlier rebasing of
material stuff that was subsequently merged into master with a
different commit hash (I guess, that's what it looked like anyway).

2015-07-27 18:42:16 +10:00

..

assets

Move F-Droid project into subdir, keeping a root gradle project

2014-12-09 15:36:07 +01:00

libs

Update support-v4-preferencefragment aar

2015-04-01 11:32:39 +02:00

res

Merge branch 'master' into new-swap

2015-07-27 18:42:16 +10:00

src

Merge branch 'master' into new-swap

2015-07-27 18:42:16 +10:00

test

update logic to match only parsing signed index files

2015-07-13 10:32:07 -07:00

tools

Merge branch 'master' into new-swap

2015-07-27 18:42:16 +10:00

AndroidManifest.xml

Merge branch 'master' into new-swap

2015-07-27 18:42:16 +10:00

build.gradle

Add debuggable option in build.gradle...

2015-06-21 19:13:53 +01:00

lint.xml

use official Android methods to mark strings as "do not translate"

2015-04-14 18:08:03 -04:00