Bug 949405 - Bump gaiatest version to 0.21.2. r=dhunt
Bug 938207 - [Dialer] Intermittent Travis Unit Test Failure: dialer/call_log_db Two calls, same group, different hour Add a call: Error: timeout of 2000ms exceeded r=etienne

Really use a timeout of 20s now!
Merge pull request #14604 from jaoo/928294

Bug 928294 - [DSDS][Gaia] Settings app should support call settings of multiple sim cards. r=arthurcc
Bug 949897 - Disable test_cards_view_kill_apps_with_two_apps.py r=me
Merge pull request #14651 from julienw/938207-try-2

Bug 938207 - [Dialer] Intermittent Travis Unit Test Failure: dialer/call...
Bug 946548 - [DSDS] [Gaia]: support setting preferred network type for each sim