Bug 993146 - add output_timeout for adb install; r=aki
Bug 987406 - Use a 64-bit version of xre.zip on emulator unittests, r=ahal
Merge default->production

changeset:   2654:d9601a43d376
parent:      2652:d3eca932b100
user:        Geoff Brown <gbrown@mozilla.com>
date:        Wed Apr 16 13:41:27 2014 -0600
summary:     Bug 993146 - add output_timeout for adb install; r=aki

changeset:   2655:2a89305f4a67
tag:         tip
user:        Jonathan Griffin <jgriffin@mozilla.com>
date:        Wed Apr 16 13:24:21 2014 -0700
summary:     Bug 987406 - Use a 64-bit version of xre.zip on emulator unittests, r=ahal

--HG--
branch : production