qrlib: restrict heap size to memory phone has when testing
Merge branch 'master' into ticket-22
qrlib: remove guava from qrlib jar. Something may not be setup properly in
MANIFEST.MF since the android project is not resolving transitive dependencies correctly.
It required an explicit dependency on guava in order for compilation to succeed.
qrlib: make test less noisy
qrlib: enable OOM test
fixed the OOM error with QR codes that contain a total chunk count that causes either the bitset or the array of booleans in the TorrentBar to exceed memory constraints; also cleaned up a few log messages, and removed an extra comma in the TX ui.
merge
fixed merge conflicts with the old ticket-22 branch, updated readme
merge master with ticket-22
changed received failed to say canceled