Brian sha256 changes
Merge branch 'sha256' of https://github.com/seamang/droid into sha256