Bug 961949 - [Tarako]: Integrate tarako manifest file. r=mchen
Merge pull request #144 from msliu/master

Bug 961949 - [Tarako]: Integrate tarako manifest file. r=mchen
Bug 923958 - Use our fork of the development repository
Bug 946255 - add mako manifest file for kk. r=mwu

Change-Id: Id4d662630f6bc307ed34c05622f696a6bad7695e
Bug 960491 - Add flatfish support
Merge pull request #153 from dannyliang/master

Bug 960491 - Add flatfish support
Merge pull request #154 from Seinlin/bug-946255

Bug 946255 - add mako manifest file for kk. r=mwu
Bug 980953 - Switch to using caf for the gtest repo since linaro is unreliable. r=mwu

Change-Id: Iae11262fa5cf9a10f0acb2d327b309376be87f1c
Merge pull request #156 from staktrace/peak

Bug 980953 - Switch to using caf for the gtest repo since linaro is unre...
Add flame manifest

Change-Id: I9275209586f19dcb3c5515b50b99dc183fc87677
Bug 962187 - Tracking bug for 17-mar-2014 migration work. r=hwine
Merge remote-tracking branch 'upstream/v1.4' into sgs2-jb

Conflicts:
	base-jb.xml