Bug 939588 - Build angle in unified mode; r=bjacob

--HG--
extra : rebase_source : c6e8bd797c7b8e0a27d60e905deaed3f34d2ce39