Bug 991837 - Only enable APZC during reftest-ipc (r=aki)
Bug 959327 - Enable updater in emulator eng builds. r=jgriffin
Merging from default

changeset:   2642:69131799d6e8
parent:      2640:379a327473c1
user:        Bill McCloskey <wmccloskey@mozilla.com>
date:        Tue Apr 08 15:20:04 2014 -0700
summary:     Bug 991837 - Only enable APZC during reftest-ipc (r=aki)

changeset:   2643:e0b53a09b231
tag:         tip
user:        Dave Hylands <dhylands@mozilla.com>
date:        Mon Apr 07 14:34:52 2014 -0700
summary:     Bug 959327 - Enable updater in emulator eng builds. r=jgriffin

--HG--
branch : production