prevent null byte[] in case of encoding exc
Merge pull request #311 from emdete/master

prevent null byte[] in case of encoding exc
Merge pull request #306 from danielhass/keyserver-conerror

Show error if keyserver is not reachable
API changes
fixes for OpenPgpListPreference
add lib icons for holo light
Update from transifex
version code 23101 for beta testing
version code 23101 for beta testing
version code 3 API lib
Merge remote-tracking branch 'upstream/master'