Backed out changeset 55fa2277a702 (bug 848592) for exposing pre-existing rooting hazards. Will fix the problems before relanding. The green you see is a lie.
Bug 857730 - Add read and write contacts Android permissions to Android manifest file. r=cpeterson
Bug 862952, Re-enable Composer2D after layers refactoring. r=bjacob,f=diego

--HG--
extra : rebase_source : eb394b6a7157b399d2e67baf695e9684835bbfcf