Bug 1011958 - ICS build bustage in out/host/linux-x86/obj/EXECUTABLES/triangleCM_intermediates/triangleCM,r=edmorley
Bug 1010652 - [Vixen][Tablet] Integrate vixen manifest file. r=mwu
Merge pull request #179 from xwaynec/master

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