Bug 956442 - Include version in desktop Sync client records. r=gps, a=bajaj
Bug 956443 - Include version in Android Sync client records. r=nalexander, a=bajaj
Bug 956936 - Include supported Sync protocol versions in desktop client records. r=gps, a=bajaj
Bug 956935 - Include supported Sync protocol versions in Android client records. r=nalexander, a=bajaj
* * *
Bug 956935 - Follow-up: Fix bustage. r=me
Bumping gaia.json for 3 gaia-1_3 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/7c39fbc4280d
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #15238 from timdream/keyboard-remove-ime-v1.3

Bug 956659

========

https://hg.mozilla.org/integration/gaia-1_3/rev/a00191b6dd5a
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 956659 - Part II (v1.3 only) skip JSPinyin tests for now

========

https://hg.mozilla.org/integration/gaia-1_3/rev/bdda22ad1465
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Revert "Revert "Merge pull request #15035 from timdream/keyboard-remove-ime""

This reverts commit 67b35df4ab2ee428b32ca041fb95a9383642a253.
Bug 949843 - Don't use char* str = NS_ConvertUTF16toUTF8(aBdAddress).get();. r=echou, a=1.3+
Bug 953036 - Set HSP flag when BluetoothHfpManager chooses to connect HSP. r=echou, a=1.3+
Bug 946596 - Support high resolution screenshots. r=timdream, r=dflanagan, a=1.3+
Bug 949930 - CameraControl.sensorAngle doesn't return consistent angle among different devices. r=mikeh, a=1.3+
Bug 956858 - Make menu inaccessible during editing mode. r=wesj, a=bajaj
Bug 953334 - Clear the clip on the surface when we get a new DC. r=BenWa, a=bajaj

Currently we can think that we have a clip set on the DC when we actually
don't. Calling _cairo_win32_surface_set_clip_region(NULL) clears this so that
when we call it with the a region we will set it properly on the new DC that
doesn't have the clip set on it.
Bug 957236 - Fix infinite loop on win32 when network interfaces contain a '.'. r=ekr, a=bajaj
Bug 958726 - Perform shrinking GC if nsJSContext::GarbageCollectNow is called with aShrinking == ShrinkingGC. r=billm, a=bajaj
Bug 957665 - Add telemetry to measure how many people have OCSP enabled. r=keeler, a=bajaj
Bug 957665 - Remove 'expires_in_version' parameter, which doesn't exist for <Fx29. a=bustage
Bug 875750 - Provide a basic color picker for Android. r=mfinkle, a=lsblakk
Bumping gaia.json for 9 gaia-1_3 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/a62082f18325
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #15217 from Moz-TedC/master

Bug 953041 - Adding English, Chinese, and French translations for "skip" button, r=timdream
(cherry picked from commit 84829641b0b20b5e7c1a5d0cc43bf6d32d8b4cca)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/66011105daf6
Author: punamdahiya <punamdahiya@yahoo.com>
Desc: Merge pull request #15167 from punamdahiya/Bug950184

Bug950184 - Fix of dotted line in header bar r=arnau
(cherry picked from commit 4776e906f35b9d837f6c1f9ecea855493a73824f)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/6fe76f9d6710
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #15090 from mikehenrty/bug-956851-appname

Bug 956851 - Fetch the application name when displaying offline errors
(cherry picked from commit b58131a2a3a7a9c6e927b02ac87a366d051fa043)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/74eadf4ef839
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #15185 from jrburke/bug950037-email-tap-icon-error

Bug 950037 - [Email][V1.3] Tap < icon cannot get any response
(cherry picked from commit 9189c61e4cb2137ccae2ca8f78b648b8f8e0d94f)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/f7f22855a579
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #15109 from Rik/conference-error-938099

Bug 938099 - display conference error when merging or removing r=etienne
(cherry picked from commit 651a32dda063ad5b818b7986532f4ae259e3967f)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/ab5a82d81786
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #15157 from acperez/bug-957966

Bug 957966 - Single variant browser bookmarks are not loaded. r=benfrancis
(cherry picked from commit 2a4d5d81f38dfdb05f4bc655e23169790b3ce74d)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/bab1b03d055d
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #15141 from dominickuo/bug-949845

Bug 949845 - [music] hide the cover controls for music open activity, r=jimporter
(cherry picked from commit a84aa6d4104994d09cec5e377b595b53c9a9e2e0)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/dd97e0c127b6
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #14737 from jrburke/bug950588-email-missing-folder-list

Bug 950588 - [Email][V1.3] Cannot get the folder list while you want to move multiple mails r=gaye
(cherry picked from commit 2c883c3195b3d632f3374221a5d4b9e3bdd579d2)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/54c878469697
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #15108 from etiennesegonzac/bug-956829-sim-pin-1.3-fix

Bug 956829 - Properly forwarding the sim pin requestClose reason to SimLock r=alive
(cherry picked from commit 59cfe743c5b69c4fcf5707168a041563a0501f8b)
Bumping gaia.json for 7 gaia-1_3 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/8af3870d751d
Author: Jim Porter <squibblyflabbetydoo@gmail.com>
Desc: Merge pull request #14793 from jimporter/music-scale-progress

Bug 950783 - [music] Make progress bar scale to the whole width of the screen, no matter the resolution; r=dkuo
(cherry picked from commit 6c7ddcc1bba97fcc2864593a602c0c65aca1ff5c)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/f706bc9e0d28
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #15127 from asutherland/163-imap

Bug 951076 - [fugu][buri] Force 163.com to use IMAP with custom autoconfig because the AutoDiscovered ActiveSync implementation deviates from standard. r=mcav
(cherry picked from commit 7e49d834fcc79dd1f75e086ae95f9c5bd78d029c)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/3cd428b96989
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #14998 from KevinGrandon/bug_956012_update_mobile_shims

Bug 956012 - Desktop b2g with local profile is trying to load the SIM / JavaScript error: conn.setVoicePrivacyMode is not a function
(cherry picked from commit fa66acd68ac739690b2b892997de5e43e9fe42e7)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/5c36d4e4d493
Author: Albert <acperez@tid.es>
Desc: Merge pull request #14763 from acperez/bug-937096

Bug 937096 - The ringtone name does not appear in sounds settings.
(cherry picked from commit ee15b42c1efb2b9875465076388a43096e67b813)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/0a4552459388
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14800 from jmcanterafonseca/fix_active_dup_list

Bug 951562 - Enable active state for the items in the duplicate contacts...
(cherry picked from commit 983d0be9b3517258d537533d2a00456daf073212)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/c83b53f51977
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #14415 from julienw/fix-invalid-recipient-width

Bug 946744 - [Messages] Long invalid recipients makes the recipient pane...
(cherry picked from commit 78b443d6b35676dc797c66a692fa2c3f5f9984f1)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/302f758cecda
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #14404 from rnowm/sticky-headers-SMS

Bug 946693 - Fix sticky headers in [SMS] app
(cherry picked from commit a7d5a5e582b11b14ea7f43b5b6dc2db92a2d9131)
Bumping gaia.json for 2 gaia-1_3 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/77d5f63ec231
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #15274 from mcav/fix-disappearing-attachments-v1.3

Bug 950207 - [Email][V1.3][POP3] The attachment disappears when first time to open a mail. r=asuth a=1.3+

========

https://hg.mozilla.org/integration/gaia-1_3/rev/af14bfbe3ddf
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 950207 - [Email][V1.3][POP3] The attachment disappears when first time to open a mail. r=asuth
Bumping gaia.json for 1 gaia-1_3 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/3b515de947af
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #14957 from crh0716/909266

Bug 909266 - Add settings helper for roaming perference r=alive, jaoo(cherry picked from commit 3b603d6adb6b92df347f953e22e4c5f35927c97d)

Conflicts:
	apps/settings/index.html