Bumping gaia.json for 106 gaia-1_2f revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/c0ff2230e2dc
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: Bug 948994 - [e.me] Temporarily disable stats reporting [r=amirn]

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/4bfb264fff62
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 930402 - Part II, set/remove keyboard.current in keyboard app

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/236f855bda92
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #14614 from Rik/call-screen-banner-multiline-946742

Bug 946742 - Message overlapped during multiparty when a call is released r=etienne
(cherry picked from commit 0ee9b91a5cf770c099ecaeaadf85fec9c493f53d)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/97df0902e09e
Author: Eric O'Connor <eric@bocoup.com>
Desc: Bug 944271 - [OTA][Data Migration][Clock] The alarm events will...
   be lost after update from v1.1 to v1.2

Adds a routine to startup.js to convert old Alarm entries to the
new format.

(cherry picked from commit 979a3db21abd154efef337686e7a15d846c3d65f)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/c9fa3c15f4f2
Author: Carmen Jiménez <cjc@tid.es>
Desc: Merge pull request #14657 from mcjimenez/bug949315_v1.2

(v1.2) Bug 949315 - Travis unit test failure on v1.2: initGridManager is not defined

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/ed26ceb0a965
Author: Carmen Jimenez Cabezas <cjc@tid.es>
Desc: Bug 949315 - Travis unit test failure on v1.2: initGridManager is not defined

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/4eb29d5a57de
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Merge pull request #13955 from fcampo/exported-label-translate-929552

Bug 936889 - Followup for bug 929552 - Sync string for exported contacts (r=pike)(cherry picked from commit 10e5cd63155a41927b9fa3b5a2bd0726ed85f1ab)

Conflicts:
	apps/communications/contacts/locales/contacts.en-US.properties

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/0c310791efd7
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #14594 from evelynhung/issue-943317-v1.2

Bug 943317 - add a timer for expiring disableTap

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/a74d57288434
Author: Evelyn Hung <jj.evelyn@gmail.com>
Desc: Bug 943317 - add a timer for expiring disableTap

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/1adf38244854
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #14392 from huchengtw-moz/gallery/Bug_946327_two_activity_handling

Bug 946327 - [B2G][SMS][MMS] Tapping multiple times rapidly on a sent or..., r=djf
(cherry picked from commit 38bddda919bcfa87abb1017a0c5484bdf7d0351c)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/00014264ed43
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #14517 from dmarcos/bug948143

Bug 948143 - [gallery] Replace giant icons with reasonably sized one
(cherry picked from commit 329d2e6d2cf73ffe20a21c365a2015de54e7b83d)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/3e37db2a7220
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #14391 from huchengtw-moz/gallery/Bug_945355-2

Bug 945355 - [B2G][Gallery] Viewing picture recieved in email or MMS sho..., r=djf
(cherry picked from commit 445cbc90e986d0d47194216eabd89a24f4a0f671)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/1a7a809a322f
Author: Reuben Morais <reuben.morais@gmail.com>
Desc: Merge pull request #13853 from bgirard/HomescreenBorder

Bug 939392 - Remove invisible border for better performance. r=crdlc
(cherry picked from commit 019275e2e193ce7e9b5ac5f362af93ac0773722a)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/f3bac65e2083
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #12286 from EragonJ/bug-914317

Bug 914317 - Add a check to remove title in prompts, r=@alivedise
(cherry picked from commit fb4fd23a83ca439d317238e8cba0d72d13990d44)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/4e86dc2ad34b
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14620 from davidflanagan/bug946803-v1.2

Merge pull request #14435 from huchengtw-moz/camera/Bug_946803_transform...

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/d3e3d5cd838f
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #14435 from huchengtw-moz/camera/Bug_946803_transform-origin

Bug 946803 - [B2G][Camera] After user opens new photo from thumbnail in ..., r=djf(cherry picked from commit 06386175236ae1618663163849343172668dbdec)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/7d6e68e80014
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #14488 from RudyLu/keyboard/Bug888253-keyboard_settings_migration

 Bug 888253 - Settings data migration for keyboard layouts.
r=gnarf, gary, yuren(cherry picked from commit 51ed5c6b6bda46284e797648b4b44dc9f804b14b)
a=koi+

Conflicts:
	build/settings.js

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/ec65b935ae47
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #14304 from RudyLu/keyboard/Bug930358-use_manifestURL_to_indentify_keyboardApp

Bug 930358 - Use manifestURL instead of app origin to identify a
r=gnarf, gary, arthur(cherry picked from commit 846b677b4975639dc61fce28e21d36d724f38160)
a=koi+

Conflicts:
	shared/resources/keyboard_layouts.json

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/571bf4395710
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #14524 from alivedise/bugzilla/946482_v1.2/activity-chaining-done

Bug 946482 - activitydone handler fine tune, r=timdream

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/9adda225ca26
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 946482 - activitydone handler fine tune

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/0ca7f3bc7aa8
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14547 from davidflanagan/bug946519-v1.2

Bug 944276: MMS workaround for problem with memory-backed blobs r=julienw

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/6e7885ab9acc
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 944276: MMS workaround for problem with memory-backed blobs

fix failing test and address review comments

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/a3d07c407326
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14568 from jmcanterafonseca/fix_dups_export_bug948862_v12

Bug 948862 - [Contacts] The first time exporting a contact to SIM create...

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/12d04f271962
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 948862 - [Contacts] The first time exporting a contact to SIM creates a duplicate of the contact in the contact list

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/9a4d3826abbd
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #14464 from AndreiH/bug938061_v1.2

bug 938061 - final  - r=zac

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/0c5405f5c67f
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: bug 938061 - final  - r=zac

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

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/3f55783a74ee
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #14505 from AlinT/12bug_937336

Bug 937336 - Remove explicit frame switching from Homescreen/everything ...

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/002de3b0eb78
Author: AlinT <trifandreialin@gmail.com>
Desc: Bug 937336 - Remove explicit frame switching from Homescreen/everything me app objects and tests

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/4440b71ea5bf
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 928968 - Add a command to the gaia command line tool to print the applications installed. r=zcampbell r=rwood

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/4b201cd09c92
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 946644 - Fix skip-if syntax issue for emulators. r=jgriffin

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/e6e627672136
Author: Malini Das <mdas@mozilla.com>
Desc: Bug 945284 - Bump gaiatest version to 0.20. r=dhunt

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/3983cb8cebf5
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14475 from davidflanagan/bug945376-v1.2

Bug 945376: correctly handle the None alert tone setting

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/4cb26c249893
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 945376: correctly handle the None alert tone setting
(cherry picked from commit 19dba5709ee860750765636f298889bf1441d083)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/7466402c1485
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14474 from davidflanagan/bug939962-v1.2

Merge pull request #13887 from davidflanagan/bug939962

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/d73a38bad9ea
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #13887 from davidflanagan/bug939962

Bug 939962: attempt to reduce memory requirements for saving an edited i...(cherry picked from commit 08d96ee9678bef48a4540470ed96d32e962ff557)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/0bc7043cf39b
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14412 from jmcanterafonseca/fix_sim_export

Bug 944575 - When exporting a local contact to SIM save the iccContactId...

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/ba5bb4b27ea0
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 944575 - When exporting a local contact to SIM save the iccContactId in order to align with bug 943234

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/1b1ba5a8dae0
Author: AndreiH <andrei.hutusoru@gmail.com>
Desc: Merge pull request #14460 from viorelaioia/bug-945261

Bug 945261 - [v1.2] Investigate intermittent fail in test_cards_view_lau...

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/4326bb174e47
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 945261 - [v1.2] Investigate intermittent fail in test_cards_view_launch_app.py

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/d998fe96f60c
Author: AndreiH <andrei.hutusoru@gmail.com>
Desc: Merge pull request #14231 from bobsilverberg/bb

Bug 943844 - [v1.2] Intermittent failures of test_browser_bookmark.py on Travis on v1.2

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/60812e9664ea
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 943844 - [v1.2] Intermittent failures of test_browser_bookmark.py on Travis on v1.2

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/90b0bc477ad0
Author: AndreiH <andrei.hutusoru@gmail.com>
Desc: Merge pull request #14406 from bebef1987/v1.2

Bug 943881 - Add camera=true tag to test_sms_with_attachments.py

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/174f934e92c5
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 943881 - Add camera=true tag to test_sms_with_attachments.py

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/21ac34a6e129
Author: AndreiH <andrei.hutusoru@gmail.com>
Desc: Merge pull request #14407 from bebef1987/944274_1.2

Bug 944274 - The self.lockscreen.is_locked is True when user unlock from...

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/6dc986072115
Author: askeing <askeing@gmail.com>
Desc: Bug 944274 - The self.lockscreen.is_locked is True when user unlock from lockscreen to camera with passcode

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/d01549da139c
Author: Carmen Jiménez <cjc@tid.es>
Desc: Merge pull request #14456 from mcjimenez/bug944495_12

Merge pull request #14241 from mcjimenez/bug944495. Rebased for v1.2

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/d0cfa84b55f2
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #14241 from mcjimenez/bug944495

Bug 944495 - Race condition when installing single variant apps(cherry picked from commit 573304f58bb431c3622a86786b5e17aaa65b07b9)

Conflicts:

	apps/homescreen/js/configurator.js
	apps/homescreen/js/grid.js

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/086f5d05c63c
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #14201 from timdream/keyboard-disable-install

Bug 944295 - Uninstall the input app when the feature is not enabled, r=gchen
(cherry picked from commit 00b3f8e781ce8d721c50ea7015010b67dba69c2a)

Conflicts:
	apps/system/test/unit/mock_keyboard_manager.js

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/7818251142a6
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 946644 - Update the unit and camera gaia-ui-tests for running on emulators. r=jgriffin

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/4af5ec053993
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #14430 from steveck-chung/v1.2-uplift

Bug 929317 - [Message] Message waiting UI was flicked while start up. r=julienw, a=koi+

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/9e9968757e13
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 929317 - [Message] Message waiting UI was flicked while start up

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/d10427bf5a2c
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #14345 from Neeraj-Seth/bug_945567_sdcard_disabled

Bug 945567 - [FTU] Import contacts - import from SIM CTA and Memory Card...
(cherry picked from commit 324c467fc6b202fd09efe4b16cd83960fd2901eb)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/9fb4c7ea20c7
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #14208 from gasolin/issue-944584

Bug 944584 - Add capture permission to SYSTEM app to enable BOOKMARKED w..., r=alive
(cherry picked from commit cfdbdf29af3226d505bdc72ad9cf2ab812685251)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/bf35aa60ddf6
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Merge pull request #13238 from fcampo/exported-label-translate-929552

Bug 929552 - Footer message is not translated (r=pike,arcturus)
(cherry picked from commit 483d1f7063f714df3884bc11e680c70250a38a51)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/8f6f360a92e8
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #13939 from flodolo/bug941901

Bug 941901 - [settings] Use correct entity name for Cell broadcast r=crh0716(cherry picked from commit e42fdf6a6b77038b0a2cd46b9193378d84794c20)

Conflicts:
	apps/settings/elements/messaging.html

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/59d30d2a6556
Author: gitmai <mri@tid.es>
Desc: Merge pull request #14390 from gitmai/bug-944718-Broken-usage-widget_v1.2

Bug 944718 - [Cost Control] Broken access to usage widget from utility t...
r=jmcf

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/39091e360d48
Author: mai <mri@tid.es>
Desc: Bug 944718 - [Cost Control] Broken access to usage widget from utility tray

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/3f92117abbe5
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #14251 from dominickuo/bug-943797

Bug 943797 - [music] Use hash to decide the default album art, r=jimporter(cherry picked from commit e01827ec7b9bc0426e0f5d216123b9247413db4e)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/073ac4ed9b6d
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #14210 from AlinT/bug_943337_v1.2

Bug 943337 - Merge all 2 kill cards view tests into one.

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/33db77b11c93
Author: AlinT <trifandreialin@gmail.com>
Desc: Bug 943337 - Merge all 2 kill cards view tests into one.

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/5179d960b469
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 943183 - [Messages] the bad recipient markers should not be absolutely positioned to a non-scrolled ancestor r=schung

* Add "position: relative" for the absolutely positioned marker's nearest
  ancestor.

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/2f94c68612bf
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #14312 from AlinT/bug_938203_1_2

Bug 938208 - Write test to enable Power Save mode

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/401486169080
Author: Teodosia Pop <teodosia.pop@gmail.com>
Desc: Bug 938208 - Write test to enable Power Save mode

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/c767b7abfc42
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Squashed commit of the following:

commit 7fbf1f71680fac105ada32406d3e078055c7d874
Merge: 6ec8bdf 81158ca
Author: Bob Silverberg <bob.silverberg@gmail.com>
Date:   Wed Dec 4 10:28:42 2013 -0500

    Merge branch 'bug_930932_v1.2' of https://github.com/viorelaioia/gaia into pr13348

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

commit 81158cae9dc39cf1818e8e63acf0f8cb04686f2b
Author: Viorela Ioia <viorelaioia@gmail.com>
Date:   Wed Nov 27 11:01:07 2013 +0200

    Bug 930932 - [v1.2] Write a test to use the Keyboard's predictive text

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/31e00c655bea
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #14318 from AndreiH/test-flick-calendar-through-months_v1.2

Bug 937085 - Write test to flick calendar through months

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/edf355641622
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 937085 - Write test to flick calendar through months

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

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/c20719719666
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #13707 from AndreiH/bug938577_v1.2

Bug 938577 - [v1.2] Write a test for using the email keyboard

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/3ad1fa9bd1b0
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Adding email keyboard test.

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

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/apps/ui_tests/regions/keyboard.py

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/4ee61754abfe
Author: Trif Andrei-Alin <trifandreialin@gmail.com>
Desc: Merge pull request #14269 from bebef1987/gmail_v1.2

Bug 943441 - test_import_contacts_from_gmail is failing on master for th...

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/e889829cd884
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 943441 - test_import_contacts_from_gmail is failing on master for the wrong reason

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/eb57679e333c
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #14319 from AndreiH/bug945227_v1.2

Bug 945227 - tap_back_from_import_contacts needs a stronger wait r=me

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/418e889493c5
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 945227 - tap_back_from_import_contacts needs a stronger wait r=me

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/c43cdfa0fe71
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #14106 from AndreiH/bug_937584_v1.2

Bug 937584 - Modify test_sms_to_dialer.py to use SendSMS atom

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/725ae1eff0a5
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 937584 - Modify test_sms_to_dialer.py to use SendSMS atom

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/apps/messages/app.py

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/08ad2b4a8126
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #14317 from AndreiH/bug945011_v1.2

Bug 945011 - Update Music app object to use Marionette Actions for tappi...

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/1c22029340f1
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 945011 - Update Music app object to use Marionette Actions for tapping

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/7038be20999d
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #14315 from AndreiH/bug_940295_v1.2

Bug 940295 - Refactor test_calendar_new_event to use default date values...

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/6da9f709edfa
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 940295 - Refactor test_calendar_new_event to use default date values. Also clean up calendar app locators

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

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/d0b0fb8aeea5
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #14314 from AndreiH/bug_943865_v1.2

Bug 943865 - Increase timeout in wait_for_filmstrip_not_visible

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/e0f32abeda60
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 943865 - Increase timeout in wait_for_filmstrip_not_visible

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/5f4a429b59ed
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14342 from davidflanagan/bug935273-v1.2

Bug 935273: don't decode full-size image during pick activity unless nec...

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/a011e76efc7e
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 935273: don't decode full-size image during pick activity unless necessary

Modify ImageEditor to have a "crop only" mode where it displays
only a preview image and crop handles and does not do other image editing.
In this mode it does not decode the full-size image unless the user actually
crops the image.

Address review comments; handle orientation change; handle case where image has no preview
(cherry picked from commit 16079236610d093aec86c62243eb9987ab8d3dd6)

Conflicts:

	apps/gallery/js/ImageEditor.js

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/32781fa2d053
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #14059 from rexboy7/fix-bug928597

Bug 928597 - [Dialer][CDMA] Show switch call text in proper font size(cherry picked from commit 77420f0568432a3ed236137e27caa8cd832eed8c)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/e8c4995293e1
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #14334 from huchengtw-moz/video/bug_938967-v1.2

Merge pull request #13824 from huchengtw-moz/video/Bug_938967_00-00_is_n...

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/a5573baa1294
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #13824 from huchengtw-moz/video/Bug_938967_00-00_is_not_handle_correctly

Bug 938967 - [fugu][hamachi]The video had be sought to 00:00 could not b..., r=djf
(cherry picked from commit fe33351a4a460172212ad234b1a98ba2dcd29ac4)

Conflicts:
	apps/video/js/video.js

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/4b95d9560803
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #14113 from rexboy7/fix-bug933153

Bug 933153 - hold active call before making another call. r=etienne
(cherry picked from commit 286be9eb5ffc0e879d05703f0d291b5efbd818e6)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/b76c32c3df65
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #14135 from crdlc/bug-942294

Bug 942294 - unable swipe from e.me to apps page if swipe starts at edge...
(cherry picked from commit 833afc850d7a62a15ff1b178db806210f2ac839f)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/84452407cc61
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #14275 from bobsilverberg/xfail_eme_install

Bug 945368 - [v1.2] Xfail test_everythingme_app_install.py due to long_press bug

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/90033c78eceb
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 945368 - [v1.2] Xfail test_everythingme_app_install.py due to long_press bug

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/ab303aebb061
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #14075 from dominickuo/bug-911108-new

Bug 911108 - [music] change the hash and option to mix page when the player is reset by the storages, r=huchengtw-moz(cherry picked from commit 2758561ca39d2d2c30a4425f087515284b6c095f)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/0d8ceb772783
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #14249 from RudyLu/keyboard/Bug942065-make_auto_suggestion_output_full_word

Bug 942065 - [b2g] auto suggestion uses truncated/shortend words.
r=timdream(cherry picked from commit 38bb3f608bafeda965274abfe941678197e2da2a)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/79115b1dd172
Author: GaryChen(pychen) <mmm198219@gmail.com>
Desc: Merge pull request #14293 from mpizza/Bug_941567_v1.2

Bug 941567 - [Keyboard][V1.2] The keyboard name of notification bar is i...
(cherry picked from commit fc3ef53)

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/3176594e7798
Author: mpizza <mmm198219@gmail.com>
Desc: Bug 941567 - [Keyboard][V1.2] The keyboard name of notification bar is incorrect
     -- since keyboard show timing is depends on 'mozbrowserresize' event,
        so call 'showIMESwitcher' in the end of 'resizeKeyboard'
        to make sure refresh latest information at each time while keyboard layout is chnaged.
     -- ignore mozbrowserresize event while keyboard Frame is hidding.

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/e7b7f2cfa6ca
Author: AndreiH <andrei.hutusoru@gmail.com>
Desc: Merge pull request #14261 from bobsilverberg/pr14027

Bug 921514 - Create app object for the Music app

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/5884f137dc6b
Author: Sasha Kruglov <sashakruglov@hotmail.com>
Desc: migrate music app tests to app object

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/e5f4453b3d98
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #14230 from bobsilverberg/tbpl_contact_input

Bug 934446 - Test Messages contact input validation

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/25303ccdc2db
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 934446 - Test Messages contact input validation
Enabling the test on tbpl for v1.2

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/1c6d8c5c959a
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #14131 from AndreiH/bug927870_v1.2

Bug 927870 - Neaten up UI Tests app's app object

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/0a2254000b16
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 927870 - Neaten up UI Tests app's app object

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/65e7d4005a72
Author: Trif Andrei-Alin <trifandreialin@gmail.com>
Desc: Merge pull request #14212 from AndreiH/bug944645

Bug 944645 - [v1.2] Unxfail test_gallery_crop_photo.py

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/4456528bcf5e
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 944645 - [v1.2] Unxfail test_gallery_crop_photo.py

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/ab0867b3d67c
Author: Malini Das <mdas@mozilla.com>
Desc: Bug 943008 - Enable pinning of marionette_client package in setup.py. r=dhunt

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/c4c6143d1253
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #14031 from bobsilverberg/bug932753-1.2

Bug 932753 - Update test_settings_do_not_track to use new Gecko pref helper methods

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/f9b95089315b
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 932753 - Update test_settings_do_not_track to use new Gecko pref helper methods

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/511fbe935904
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14163 from jmcanterafonseca/fix_import_export_flows

Bug 943298 - In SIM import-export contacts flows avoid creating new entr...

========

https://hg.mozilla.org/integration/gaia-1_2f/rev/d38de90e767b
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 943298 - In SIM import-export contacts flows avoid creating new entries in the SIM card