mozilla-b2g/gaia — pull request #17460 by KevinGrandon (2014-03-21 17:42:49+00:00)
Title: Bug 982260 - Gaia-integration tests on TBPL fail with: TEST-UNEXPECTED-FAIL | Contacts > Details Merging 15 contacts

Conflicts:
apps/communications/contacts/test/marionette/details_test.js
shared/test/integration/tbpl-manifest.json

https://bugzilla.mozilla.org/show_bug.cgi?id=982260