Revert "Bug 1218783 - shared component gaia_grid_rs has been added" f…

…or perma failures

This reverts commit b1b12cf.

Merge pull request mozilla-b2g#32267 from cr/fmdpasscodefix-v2.2

Bug 1201530 - Fixing FMD passcode override. r=gerard-majax

Revert "Fix passcode override bug 1201530" for breaking GU Tests

This reverts commit 672411d.

Merge remote-tracking branch 'origin/v2.2' into v2.2r a=2.2rmerge

Bug 1190038 - Sanitize all HTML elements. r=gandalf

Bug 1190038 - Sanitize all HTML elements. r=gandalf

Merge branch 'v2.1' into v2.1s

Merge pull request mozilla-b2g#30718 from gmarty/Bug-1085651-Incorrec…

…t-time-and-status-showed-in-the-statusbar-v2.2

Bug 1085651 - Incorrect time (clock) and status showed in the statusbar

Merge pull request mozilla-b2g#30612 from RudyLu/keyboard/Bug1114864-…

…igbo_layout_v2.1

Bug 1114864 - merge pull request mozilla-b2g#29916 from

Merge branch 'v2.1' into v2.1s