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
make Cancel button appear at the bottom when a transfer is in progress
put Settings in the ActionBar title
show fragment name in log
resolve merge conflicts from master
connect the cancel buttons to the same callback
show/hide both header and footer
removing obsolete check
unused placeholder class
hide the UI even on Settings
dont remove the settings menu option
Merge branch 'master' into ticket-62
progressCancelButton
reset UI on fail
Merge branch 'ticket-56'
Android Studio 0.6.0 / Gradle 0.12 project config updates