Bug 922703 - Refine the error handler for card lock functionality
Bug 919882 - Use latest mozilla-central b2g build on travis
Merge pull request #12703 from EdgarChen/bug_922703

Bug 922703 - [Gaia] Refine the error handler for card lock functionality (r=fcampo)
Bump marionette-apps to ~0.3.1
Merge pull request #12777 from lightsofapollo/more-recent-b2g

Bug 919882 - Use latest mozilla-central b2g build on travis
Merge pull request #12800 from gaye/bump-marionette-apps

Bump marionette-apps to ~0.3.1 r=kgrandon
Bug 924274 - Add contacts tests