Bug 982093 - Remove persist single variant conf when flashing gecko and gaia
Merge pull request #335 from acperez/bug-982093

Bug 982093 - Remove persist single variant conf when flashing gecko and gaia
Bug 1010652 - Support vixen in B2G. r=mwu
Merge pull request #348 from xwaynec/master

Bug 1010652 - [Vixen][Tablet] Integrate vixen manifest file. r=mwu