open-keychain/OpenKeychain/src/main/java
Vincent Breitmoser abd1211613 hack to make WrappedUserAttribute serializable
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
2015-01-13 20:42:40 +01:00
..
android/support/v4/widget Hack to disable overscroll effect of swipe to update 2014-09-13 23:08:04 +02:00
com/haibison/android/lockpattern Passphrase wizard tests 2015-01-06 14:52:07 +01:00
org hack to make WrappedUserAttribute serializable 2015-01-13 20:42:40 +01:00