Bug 1003623 - add mozilla_api_key. r=bhearsum
Bug 1006082 - Run Android 2.3 tests against armv6 builds, on Ash only r=aki
Merging from default

changeset:   1774:36e74d7a6f39
parent:      1772:a4c7721ef765
user:        Massimo Gervasini <mgervasini@mozilla.com>
date:        Wed May 28 12:53:43 2014 +0200
summary:     Bug 1003623 - add mozilla_api_key. r=bhearsum

changeset:   1775:ad32888ce123
tag:         tip
user:        kmoir@mozilla.com
date:        Wed May 28 09:04:48 2014 -0400
summary:     Bug 1006082 - Run Android 2.3 tests against armv6 builds, on Ash only r=aki

--HG--
branch : production