Bug 915570 - (part III) rename permission in test-ime, r=me, a=testonly
Merge pull request #13462 from timdream/keyboard-callback-error

Bug 935868 - check for callback(), r=rudyl
Bug 920546 Uplift supplement: compareDialables => probablyMatches r=julien

This uplitfts the part of bug 877718 that renames compareDialables to
probablyMatches, which we uses in this patch.

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 930500 - Many builds error because they can't find a binary, Bug 935489 - mozilla-download should always display the downloaded URL

a=tests
Bump up mozilla-download version
(cherry picked from commit 5422c15cf6555f2b13a5195544a5bec1dc09ca85)

Conflicts:
	package.json
Bug 912033 - Pop down animation keyboard
Bug 922569 - Fix DTMF tone length when in long mode r=etienne
Merge pull request #13465 from mpizza/Bug_931229_v1.2

Bug 912033 - Pop down animation keyboard. r=GaryChen.
Merge pull request #13451 from bobsilverberg/935044

Bug 932725 - Add a test to check that the "dial" activity is working, a=test-only
Merge pull request #13392 from bobsilverberg/v1.2935041

Bug 935041 - Investigate test_sms_add_contact failure, resolve and re-enable the test
Bug 935964 - Bump gaiatest to 0.19. r=dhunt
Bug 933709 - Write test for geolocation prompt
Bug 935440 - Fix my mistake in test_geolocation_prompt.py

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/system/manifest.ini