Merging from default
Merging from default

changeset:   3854:d80001d9daf9
tag:         tip
parent:      3852:93f2a676ccb1
user:        Justin Wood <Callek@gmail.com>
date:        Mon Apr 06 17:46:59 2015 -0400
summary:     Bug 1151498 - Lock updates on aurora during merge day for android api-9 builds as well. r=jlund

--HG--
branch : production

mozilla/build-mozharness,mozilla/build-mozharness