Bug 969556 - Fix break of keon v1.3 builds; r=mwu
Merge pull request #149 from comoyo/keon-1.3-fix

Bug 969556 - Fix break of keon v1.3 builds; r=mwu
Bug 972318 - Revert platform_build to gp-b2g master for peak. r=hwine
Merge pull request #151 from comoyo/peak-1.3-fix

Bug 972318 - Revert platform_build to gp-b2g master for peak. r=hwine
Merge branch 'v1.3' into v1.3t

Conflicts:
	keon.xml
	peak.xml
Bug 987312 change branch to remove external/icu4c in manifest
Merge pull request #163 from sprd-ffos/v1.3t

Bug 987312 change branch to remove external/icu4c in manifest
Fix emulator bustage on 1.3t branch a=red
Bug 1011958 - ICS build bustage in out/host/linux-x86/obj/EXECUTABLES/triangleCM_intermediates/triangleCM,r=edmorley
Bug 1016157 - update vold to fix UMS is too slow. r=mwu

Change-Id: Icee85750e793c8d6c06586361745307fae297313
Merge pull request #187 from Seinlin/bug-1016157

Bug 1016157
back out 7774bc79b3ef6a80c9bc7904fc75548d57ce2955 due to bustage bug 1017073
No bug - lock apitrace to last-green 3f9ed159f086a5550ae68c74ab585c298fbccf4a. r=bustage
Revert "back out 7774bc79b3ef6a80c9bc7904fc75548d57ce2955 due to bustage bug 1017073"

This reverts commit dc458aa79e9b12c64005e3b4b73dc8c0638d9843.
Bug 1022454 - Update platform/bootable/recovery in tarako manifest. r=mwu

Change-Id: I5bfbc12e6f65dfad10271ad1784542dcbd927cfa
Merge pull request #197 from Seinlin/bug-1022454-v1.3t

Bug 1022454 v1.3t
Bug 1023353 - back out merge day change.
bug 910745 - fix dangling revision in nexus-s, remove tara. r=release
bug 910745 - lock 3rd party repo revisions. r=release
bug 910745 - lock 3rd party repo revisions. r=release