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
Bug 1015827 - Add librecovery for gonk-kk manifest file. r=mwu

Change-Id: I7fddb28de80d360dda2ca051bcf1cb338ac759c7
Bug 1000581 - remove rilproxy for flame. r=mwu
Merge pull request #182 from viralwang/bug1000581

Bug 1000581 - remove rilproxy for flame
Merge pull request #183 from Seinlin/bug-1015827

Bug 1015827 - Add librecovery for gonk-kk manifest file. r=mwu
Bug 1010008 - Switch nexus-4-kk to Mozilla fork of kernel blob.

Change-Id: I4d70d77274c6e4ffdc286d20cefc735fec4164fd