Vincent Breitmoser 0077891f1d Merge branch 'master' into v/multi-decrypt

2015-06-26 15:40:38 +02:00

..

androidTest

instrument: stash away bitmapmatcher for later

2015-06-26 13:05:52 +02:00

debug/res

Make app name reflect debug builds

2015-06-26 15:06:47 +02:00

main

Merge branch 'master' into v/multi-decrypt

2015-06-26 15:40:38 +02:00

test

Merge branch 'master' into v/multi-decrypt

2015-06-26 15:40:38 +02:00