Dominik Schürmann f62a5eded4 Merge branch 'development' into v/crypto-input-parcel		2015-03-26 22:48:06 +01:00
..
assets	remove leftover of AndroidBootstrap	2014-06-30 22:05:02 +02:00
java	Merge branch 'development' into v/crypto-input-parcel	2015-03-26 22:48:06 +01:00
res	Start refactoring encrypt ui, EncryptFileActivity no longer crashing	2015-03-26 11:04:20 +01:00
AndroidManifest.xml	Merge branch 'development' into v/crypto-input-parcel	2015-03-24 13:19:43 +01:00