Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/52a3492784fa Author: Alive.Kuo <alegnadise@gmail.com> Desc: Merge pull request #17370 from alivedise/bugzilla/961800_master_merging/child-window-factory Bug 961800 - Implement Child Window Factory, r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/a1a234a4883e Author: Alive Kuo <alegnadise@gmail.com> Desc: Bug 961800 - Implement Child Window Factory Conflicts: apps/system/js/app_transition_controller.js apps/system/js/app_window.js apps/system/js/app_window_manager.js apps/system/js/cards_view.js apps/system/style/window.css

Bumping manifests a=b2g-bump

Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c9674d674172 Author: Yuren Ju <yurenju@gmail.com> Desc: Merge pull request #17369 from yurenju/nfc Bug 963556: Update NFC Manager, Handover to use new shared nfc_utils.js. r=@alivedise ======== https://hg.mozilla.org/integration/gaia-central/rev/215146db2ced Author: Garner Lee <garner.lee@telekom.com> Desc: Bug 963556: Update NFC Manager, Handover to use new shared nfc_utils.js. Conflicts: apps/system/js/nfc_handover_manager.js apps/system/js/nfc_manager_utils.js ======== https://hg.mozilla.org/integration/gaia-central/rev/6ece05f395b5 Author: Yuren Ju <yurenju@gmail.com> Desc: Merge pull request #17363 from yurenju/stage2 Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau ======== https://hg.mozilla.org/integration/gaia-central/rev/42026d903e61 Author: Yuren Ju <yurenju@gmail.com> Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps Conflicts: Makefile apps/communications/build/build.js build/copy-build-stage-manifest.js build/test/integration/distribution.test.js build/utils-xpc.js build/utils.js build/webapp-manifests.js

Bumping manifests a=b2g-bump

Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/80bbcc74cf4c Author: Gabriele Svelto <gsvelto@mozilla.com> Desc: Merge pull request #17360 from prcxuying/bug972308 Bug 972308 - Re-use the existing Audio object when playing keypad tones r=gsvelto ======== https://hg.mozilla.org/integration/gaia-central/rev/be68ad31b801 Author: ying.xu <ying.xu@spreadtrum.com> Desc: Bug 972308 [DIALER]slow response when click on dialer panel ======== https://hg.mozilla.org/integration/gaia-central/rev/d783d8785066 Author: Jose M. Cantera <jmcanterafonseca@gmail.com> Desc: Merge pull request #17348 from qdot/985795-contact-utils-misc-unit-test-fix Bug 985795 - Only patch required single utils function versus mocking object ======== https://hg.mozilla.org/integration/gaia-central/rev/11e5b598d7f4 Author: Kyle Machulis <kyle@nonpolynomial.com> Desc: Bug 985795 - Only patch required single utils function versus mocking object

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1ee3ab22a3b9 Author: Alive.Kuo <alegnadise@gmail.com> Desc: Merge pull request #17362 from alivedise/bugzilla/983290_master/orientation-hidden Do not display perpendicular app on opening, r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/4cea30574c5c Author: Alive Kuo <alegnadise@gmail.com> Desc: Do not display perpendicular app on opening

merge b2g-inbound to mozilla-central

Bug 944890 - B2G SMS & MMS: remove convertTimeToInt(...) which is no longer needed (part 2, test cases). r=vicamo

Bug 944890 - B2G SMS & MMS: remove convertTimeToInt(...) which is no longer needed (part 1, implementation). r=vicamo

Bumping manifests a=b2g-bump

Bumping gaia.json for 18 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6d2a2c5c58fc Author: Yuren Ju <yurenju@gmail.com> Desc: Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps" This reverts commit 22a4d4f8065af46d23097bbaf898831d5c031ce3. ======== https://hg.mozilla.org/integration/gaia-central/rev/c898bac8e399 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Merge pull request #17311 from timdream/keyboard2-jshint Bug 984718 - [keyboard refactor] Fix jshint errors, r=rudyl ======== https://hg.mozilla.org/integration/gaia-central/rev/81b608b07b34 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Add test/unit/.jshintrc ======== https://hg.mozilla.org/integration/gaia-central/rev/50c5e595decc Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for shiftkey_test.js ======== https://hg.mozilla.org/integration/gaia-central/rev/f47914733adf Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for page_test.js ======== https://hg.mozilla.org/integration/gaia-central/rev/551cd52291a0 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for doublespace_test.js ======== https://hg.mozilla.org/integration/gaia-central/rev/cd3add8bf7a6 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for touch_handler.js ======== https://hg.mozilla.org/integration/gaia-central/rev/9e3bc170b4dd Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for suggestions.js ======== https://hg.mozilla.org/integration/gaia-central/rev/8e66c29fe26d Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for shiftkey.js ======== https://hg.mozilla.org/integration/gaia-central/rev/9452db9378f7 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for settings.js ======== https://hg.mozilla.org/integration/gaia-central/rev/d02f5491ce03 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for pageview.js ======== https://hg.mozilla.org/integration/gaia-central/rev/487771ef78f9 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for page.js ======== https://hg.mozilla.org/integration/gaia-central/rev/5f4e55f0b705 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for layout.js ======== https://hg.mozilla.org/integration/gaia-central/rev/551fccef9224 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for key.js ======== https://hg.mozilla.org/integration/gaia-central/rev/9d57fcda4c16 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for input_field.js ======== https://hg.mozilla.org/integration/gaia-central/rev/53c23e9f2880 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for doublespace.js ======== https://hg.mozilla.org/integration/gaia-central/rev/56a516351ac1 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for boot.js ======== https://hg.mozilla.org/integration/gaia-central/rev/7b1506bd4160 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Bug 984718 - Fix jshint errors for autocorrect.js

Bug 985735 - dom/system/gonk/NetworkService.js: WARNING: no preprocessor directives found. r=gwagner

Bug 985537: add runEmulatorShell to Marionette. r=mdas

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e10dad3943a5 Author: Arthur Chen <crh0716@gmail.com> Desc: Merge pull request #17067 from crh0716/975265 Bug 975265 - Add the support for LTE network types r=jaoo ======== https://hg.mozilla.org/integration/gaia-central/rev/d73ed53163d1 Author: Arthur Chen <crh0716@gmail.com> Desc: Bug 975265 - Add the support for LTE network types

Bumping manifests a=b2g-bump

Bumping gaia.json for 15 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/536b0405f97c Author: KWierso <kwierso@gmail.com> Desc: Revert "Merge pull request #17263 from gasolin/bubble-merge225" for possibly breaking gaia-ui tests on TBPL This reverts commit 27c414d178694a17e7a2967fa377938163ac44ae, reversing changes made to e592ec99013a43002171d1bd4be2f497c12ada88. ======== https://hg.mozilla.org/integration/gaia-central/rev/158472d7dba4 Author: KWierso <kwierso@gmail.com> Desc: Revert "Revert "Bug 985787 - Change requireApp to require to make includes work in search unit test" for possibly breaking gaia-ui tests on tbpl" because I didn't mean to revert this patch with everything else I reverted This reverts commit b3564260d93fcf7d5127de26bb7f45d13b893a42. ======== https://hg.mozilla.org/integration/gaia-central/rev/864ab4a193de Author: Yuren Ju <yurenju@gmail.com> Desc: Merge pull request #17356 from yurenju/stage2 Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau ======== https://hg.mozilla.org/integration/gaia-central/rev/3726337a624c Author: Yuren Ju <yurenju@gmail.com> Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps Conflicts: Makefile apps/communications/build/build.js build/copy-build-stage-manifest.js build/test/integration/distribution.test.js build/utils-xpc.js build/utils.js build/webapp-manifests.js ======== https://hg.mozilla.org/integration/gaia-central/rev/b92ea9307a62 Author: KWierso <kwierso@gmail.com> Desc: Revert "Bug 971546 - [System2] Instantiable Screenshot" for possibly breaking gaia-ui tests on TBPL This reverts commit ec5be24bd877588f60f6c64715b894157a20c603. ======== https://hg.mozilla.org/integration/gaia-central/rev/78c3bf7a1577 Author: KWierso <kwierso@gmail.com> Desc: Revert "Bug 971577 - [System] Make visibility manager instantiable" for possibly breaking gaia-ui tests on TBPL This reverts commit 73f3addd228aded613347bed46bd03a5941323d4. ======== https://hg.mozilla.org/integration/gaia-central/rev/fe177281e210 Author: KWierso <kwierso@gmail.com> Desc: Revert "Bug 961800 - Implement Child Window Factory" for possibly breaking gaia-ui tests on TBPL This reverts commit 439b23a04c6dba788293f577b1efe8c5d8843b78. ======== https://hg.mozilla.org/integration/gaia-central/rev/9ec410c953e8 Author: KWierso <kwierso@gmail.com> Desc: Revert "Bug 971556 - [System2] Instantiable SourceView." for possibly breaking gaia-ui tests on TBPL This reverts commit 0611fa4704a77acfe2001c80afe56a98a081df77. ======== https://hg.mozilla.org/integration/gaia-central/rev/df7f69246d85 Author: KWierso <kwierso@gmail.com> Desc: Revert "Bug 970028 - Nicer activity opener animation" for possibly breaking gaia-ui tests on tbpl This reverts commit 870a91032c9d6bd84713618df0e80f0b50962488. ======== https://hg.mozilla.org/integration/gaia-central/rev/ca4be0a3a1e7 Author: KWierso <kwierso@gmail.com> Desc: Revert "Bug 974828 - [Settings][dsds] Outgoing data confirmation is wrong" for possibly breaking gaia-ui tests on tbpl This reverts commit e592ec99013a43002171d1bd4be2f497c12ada88. ======== https://hg.mozilla.org/integration/gaia-central/rev/371d7310fbd4 Author: KWierso <kwierso@gmail.com> Desc: Revert "Bug 985787 - Change requireApp to require to make includes work in search unit test" for possibly breaking gaia-ui tests on tbpl This reverts commit 2e388f26d4a1b484d1fcfded068bc82d18ca4bf9. ======== https://hg.mozilla.org/integration/gaia-central/rev/eb1509d301d6 Author: Kevin Grandon <kevingrandon@yahoo.com> Desc: Merge pull request #17347 from qdot/985787-search-unit-test-fix Bug 985787 - Change requireApp to require to make includes work in search unit test ======== https://hg.mozilla.org/integration/gaia-central/rev/f07f5d82deee Author: Kyle Machulis <kyle@nonpolynomial.com> Desc: Bug 985787 - Change requireApp to require to make includes work in search unit test ======== https://hg.mozilla.org/integration/gaia-central/rev/73e7584ac6cd Author: Yuren Ju <yurenju@gmail.com> Desc: Merge pull request #17314 from yurenju/big920431-2 Bug 920431 - [keyboard] keyboard_layout.json should be customizable r=@yurenju ======== https://hg.mozilla.org/integration/gaia-central/rev/fd6275559f57 Author: Rudy Lu <me@rudy.lu> Desc: Bug 920431 - [keyboard] keyboard_layout.json should be customizable Conflicts: build/settings.js build/test/integration/distribution.test.js build/webapp-manifests.js

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f9ecda33f49c Author: Ian Liu <iliu@mozilla.com> Desc: Merge pull request #17175 from ian-liu/bluetooth/bug981626_support_sharing_picture_and_video_simultaneously Bug 981626 - [Sora][gallery]Can't be shared when select picture and video simultaneously, r=@dominickuo ======== https://hg.mozilla.org/integration/gaia-central/rev/7c91fc678b71 Author: ian-liu <iliu@mozilla.com> Desc: Bug 981626 - [Sora][gallery]Can't be shared when select picture and video simultaneously