Apply fix for Bug 897611 to galaxy-s2.
Bug 941478: Need x86/i686-linux-android-4.7 to build emulator-x86-jb. r=vicamo

Change-Id: I3fc4dce397d07ecbf05fb33e50be8a68f614d1bc
Revert "Bug 941478: Need x86/i686-linux-android-4.7 to build emulator-x86-jb. r=vicamo"

This reverts commit 1901086ca78f2d224245e8ceb5861d2cc569aec1.
Merge pull request #118 from justindarc/master

Apply fix for Bug 897611 to galaxy-s2. r=dhylands
Add manifest for Fugu
Merge branch 'master' of https://github.com/mozilla-b2g/b2g-manifest into default