Bug 959543 - [CostControl] Remove reference to lastSIM property
Bug 959175 - Force redraw on uppercase switch when layout has secondLayout flag
Bug 957122 - Enable more TBPL tests - Settings app

Enable test_settings_app_permissions on TBPL
Bug 957122 - Enable more TBPL tests - Lockscreen

Enable test_lockscreen_wake_with_notification on TBPL

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/tbpl-manifest.ini
Bug 946205 - Re-enable Travis tests after 891882 merged
bug 948826, add prompt testing

clone uitests into uitests-privileged and set it as a privileged app

test
 - contacts
 - geolocation
 - device-storage
 - userMedia

remove unnecessary part in uitests-privielged
skip on desktop because there's no microphone available
Bug 960039 - [system] Remove `charging` attribute

Remove unused, non-standard `charging` attribute from the markup for the
battery icon.
Bug 938540 - Use Notification API for WapPush
Bug 931711 - mozContact constructor creates unconsistent objects with the 'undefined' string as 'id'
Bug 943812 - Remove "R$" from English keyboard layout.
Bug 927319 - Fix key presses causing reflows of the entire keyboard.
Bug 960698 - Un-xfail test_settings_change_keyboard_language

Unxfailing the test as https://bugzilla.mozilla.org/show_bug.cgi?id=956761 seems to be fixed
Bug 960363 - Add basic FTE tests
Merge pull request #15416 from brunovilar/master

Bug 943812 - Remove "R$" from English keyboard layout, r=timdream
Merge pull request #15428 from bobsilverberg/kb_change_lang

Bug 960698 - Un-xfail test_settings_change_keyboard_language
Bug 959344 - Disable test_settings_gps.py due to intermittency a=testonly
Bug 960845 - compress the png image of bug 869289's patch
Merge pull request #15386 from zacc/bug_946205

Bug 946205 - Re-enable Travis tests after 891882 merged
Merge pull request #15355 from mmalecki/remove-charging-attribute

Bug 960039 - [system] Remove `charging` attribute, r=timdream
Merge remote-tracking branch 'bsilverberg/tbpl_lockscreen'

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