conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	changes to get it working under eclipse	lookshe	2015-01-10	9	-0/+30
\|
*	update android gradle plugin to 0.14.4	Michael	2014-11-22	1	-2/+5
\| \| \| \| \|	to work with AS >= 0.9.0 plugin >= 0.14.0 is required also update gradle to 2.2.
*	Subtree merged in openpgp api lib	Sam Whited	2014-10-28	45	-6/+1829
\|
*	Subtree merged in minidns	Sam Whited	2014-10-28	23	-0/+2945
\|
*	Remove minidns dir	Sam Whited	2014-10-28	1	-6/+0
\|
*	Subtree merged in MemorizingTrustManager	Sam Whited	2014-10-28	35	-0/+1875
\|
*	Move submodules back to libs/	Sam Whited	2014-10-26	3	-0/+12
\|
*	Pull otr4j form Maven repo	Sam Whited	2014-10-26	1	-0/+0
\|
*	Suppress lint errors and remove bcprov	Sam Whited	2014-10-22	1	-0/+0
\|
*	Add build deps and move build props to build file	Sam Whited	2014-10-22	2	-0/+0