Apply fix for Bug 897611 to galaxy-s2.
Merge pull request #118 from justindarc/master

Apply fix for Bug 897611 to galaxy-s2. r=dhylands