Bug 1051908 - Increase wait for sutagent startup on Android emulator; r=kmoir
Bug 1045165 - Compilation exceeds memory size for b2g hazard build, r=terrence

--HG--
extra : rebase_source : a5856cf9a888d835bd5e595819cc6c065eb39fa8
Merging from default

changeset:   3084:bb15156ec0fd
parent:      3082:f3c0437d982d
user:        Geoff Brown <gbrown@mozilla.com>
date:        Wed Aug 20 10:53:57 2014 -0600
summary:     Bug 1051908 - Increase wait for sutagent startup on Android emulator; r=kmoir

changeset:   3085:278bc2ae2354
tag:         tip
user:        Steve Fink <sfink@mozilla.com>
date:        Tue Aug 19 16:37:16 2014 -0700
summary:     Bug 1045165 - Compilation exceeds memory size for b2g hazard build, r=terrence

--HG--
branch : production