Bug 980217 - Make "Skip" and "OK" buttons show when entering SIM 2 PIN code. r=Alive
Revert "Merge pull request #19374 from mnjul/bug_1011645_lockscreen_passcode_camera_button_stall_v1.3"

This reverts commit e74f2080cc58e78957809305a27afdc1b062f876, reversing
changes made to e049de79ff46fcab51f29a88d5869c5efb48fc3c.
Merge pull request #20469 from mnjul/v1.3

Revert "Merge pull request #19374 from mnjul/bug_1011645_lockscreen_pass...
Bug 1008026 - show thumbnail instead of full size image for v1.3
Merge pull request #19994 from JerryShih/bug-1008026-wallpaper-flickering-1.3

Bug 1008026 - show thumbnail instead of full size image, r=djf
Bug 1024979 - Fix package name in HTML report for v1.3. r=zcampbell
Merge branch 'v1.3' into v1.3t
Bug#1022586 kill the homescreen app when memory low

[self test   ] kill and restore ok
Merge pull request #20397 from jimporter/email-as-user-agent

Bug 880670 - [email/activesync] some ActiveSync implementations blacklis...
Merge branch 'v1.3' into v1.3t
Merge pull request #20667 from prcxuying/bug1022586-v1.3t

Bug#1022586 kill the homescreen app when memory low
Bug 1002327 - (v1.3t)add eventlistener for mmi reply
Merge pull request #20712 from davidflanagan/bug1026846

Bug 1026846: require the type parameter for FL app view activity r=amac
Bug 1028843 - Improve wait for b2g to be resistant to JavaScript exceptions. r=zcampbell
Merge branch 'v1.3' into v1.3t
Merge pull request #20802 from weigao123/bug1002327_v1.3t

Bug 1002327 follow up- (v1.3t) Add EventListener for mmi reply r=etienne
Bug 1030687 - Bump gaiatest-v1.3 version to 0.2. r=zcampbell
Merge pull request #20525 from asutherland/email-as-dev-id

Bug 825538 - [email/activesync] Need to allocate unique device ID's for multi-device access to ActiveSync. r=squib
Merge pull request #21003 from jimporter/email-as-download-body-failure

Bug 1009422 - [email/Activesync/hotmail] Apparent change in server behav...
Merge pull request #20828 from jrburke/bug1025727-email-cronsync-failsafe

Bug 1025727 - [email/cronysync] Failsafe abort/window.close after failed cronsync(s) r=mcav
Conflicts:
	apps/email/js/cards/compose.js