Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/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_2/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
Bumping gaia.json for 6 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/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_2/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_2/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_2/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_2/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_2/rev/e0f32abeda60
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 943865 - Increase timeout in wait_for_filmstrip_not_visible
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/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_2/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
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/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_2/rev/418e889493c5
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 945227 - tap_back_from_import_contacts needs a stronger wait r=me
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/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_2/rev/e889829cd884
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 943441 - test_import_contacts_from_gmail is failing on master for the wrong reason
Bug 939315 - Please update the Helix blobs for 1.3, 1.2, 1.1 HD with the 20131106 build blobs. r=rail, a=NPOTB
Bug 934602 - [Buri] Update 1.2 blobs from OEM build for 1.2 and 1.3 channels. r=rail, a=NPOTB
Bug 932543 - Check data size before memcpy in BluetoothOppManager. r=gyeh, a=koi+
Bug 869696 - Enable gralloc on peak. r=bjacob, a=bajaj
Bug 940045 - Part 1: Provide pageURL in RecordingDeviceEvent from content process. r=khuey, a=koi+
Bug 940045 - Part 2: Send requestURL from content process. r=jesup, a=koi+
Bug 940045 - Part 3: Send requestURL from content process. r=mikeh, a=koi+
Bug 940045 - Part 4: Support multiple requestURL in one process. r=vingtetun, a=koi+
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-1_2/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_2/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
Bug 932418 - Don't create and throw away prompt when setting cookie string. r=bz, a=koi+
Bug 943729 - Crash in TimeRanges::TimeRange. r=giles, a=koi+
Bug 918863 - MutationObserver doesnt recognize all deleted elements, keypress is fired if keydown is canceled. r=yxl, r=kanru, a=koi+
Bug 935273 - B2G filePicker.js uses nocrop when no filters are set. r=dflanagan, a=koi+
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-1_2/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_2/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
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/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