Bumping manifests a=b2g-bump

Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e31b892e3313 Author: Sherman Chen <shamenchens@users.noreply.github.com> Desc: Merge pull request #20795 from shamenchens/Bug1028069-Remove-Scheme-Port Bug1028069 Remove scheme and port, r=yurenju ======== https://hg.mozilla.org/integration/gaia-central/rev/be88e279a433 Author: Sherman Chen <shamen.chens@gmail.com> Desc: Bug 1028069 - Remove Scheme and Port in build system ======== https://hg.mozilla.org/integration/gaia-central/rev/974e0185c97a Author: Jan Jongboom <janjongboom@gmail.com> Desc: Merge pull request #20922 from comoyo/bug1025808 Bug 1025808 - Need a disabled style for the key after the new visual update. r=janjongboom ======== https://hg.mozilla.org/integration/gaia-central/rev/0edb815d9acf Author: Sébastien Blin <amarok@enconn.fr> Desc: Bug 1025808 - Need a disabled style for the key after the new visual update

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d8813553b3ec Author: Min-Zhong "John" Lu <mnjul@users.noreply.github.com> Desc: Merge pull request #20791 from mnjul/bug_1027536_lockscreen_clock_stall Bug 1022984 / Bug 1027536 - After Restarting Phone, Lockscreen Time Always Shows as 5:32 or Is Stalled. r=gweng ======== https://hg.mozilla.org/integration/gaia-central/rev/131595e10f13 Author: John Lu [:mnjul] <jlu@mozilla.com> Desc: Bug 1022984 / Bug 1027536 - After Restarting Phone, Lockscreen Time Always Shows as 5:32 or Is Stalled

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d0fb4a424eb3 Author: AndreiH <andrei.hutusoru@softvision.ro> Desc: Merge pull request #20895 from zacc/bug_1028159 Bug 1028159 - Target intermittent failure in test_edit_contact.py ======== https://hg.mozilla.org/integration/gaia-central/rev/b6a72a565f3a Author: Zac <zcampbell@mozilla.com> Desc: Bug 1028159 - Target intermittent failure in test_edit_contact.py

Bug 1006310 - Patch2: Revise SetName and SetDiscoverable to use Promise. r=btian, r=bz

Bug 1006310 - Patch1: Revise setName and setDiscoverable method in BluetoothAdapter.webidl. f=btian, r=bz

Bug 1027992 - Patch: Throw an exception when Promise can't be created for enable/disable adapter requests. r=bz

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5e4665f6e770 Author: Jim Porter <jporter@mozilla.com> Desc: Merge pull request #20916 from jimporter/fix-large-icon-names Bug 1029201 - Large app icons are 284px, not 289px ======== https://hg.mozilla.org/integration/gaia-central/rev/6831c69946a1 Author: Jim Porter <jporter@mozilla.com> Desc: Bug 1029201 - Large app icons are 284px, not 289px; r=kgrandon This commit was generated by running the following shell commands to move all the files to the proper locations: find apps -name "*_289.png" -exec sh -c 'FILE=`echo {} | sed -e "s/289/284/"`; git mv {} $FILE' \; find shared -name "*_289.png" -exec sh -c 'FILE=`echo {} | sed -e "s/289/284/"`; git mv {} $FILE' \; ln -fs apps/wallpaper/style/icons/wallpaper_284.png apps/homescreen/everything.me/images/wallpaper_284.png find apps -name "manifest.webapp" -exec sed -i 's/289/284/g' {} \; Plus manually editing one instance in apps/browser/index.html

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e121943ceb1d Author: punamdahiya <punamdahiya@yahoo.com> Desc: Merge pull request #20465 from punamdahiya/Bug1010412 Bug 1010412 - [Flame] Wallpapers are Fuzzy r=patryk ======== https://hg.mozilla.org/integration/gaia-central/rev/e7454e7b5734 Author: Punam Dahiya <punamdahiya@yahoo.com> Desc: Bug 1010412 - [Flame] Wallpapers are Fuzzy r=patryk

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7bf01510f9af Author: Sherman Chen <shamenchens@users.noreply.github.com> Desc: Merge pull request #20654 from shamenchens/Bug1021481-App-Protocol-3 Bug 1021481 - Handle app:// protocol for DEBUG=1, r=ochameau ======== https://hg.mozilla.org/integration/gaia-central/rev/a099b5c731e2 Author: Sherman Chen <shamen.chens@gmail.com> Desc: Bug 1021481 - Handle app protocol for DEBUG=1 mode, with port change

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/42e71c9378f5 Author: EragonJ <eragonj@eragonj.me> Desc: Merge pull request #20274 from EragonJ/bug-968619 Bug 968619 - [Settings] add marionette test for airplane mode ======== https://hg.mozilla.org/integration/gaia-central/rev/d5308b4bd238 Author: EragonJ <eragonj@eragonj.me> Desc: Bug 968619 - [Settings] add marionette test for airplane mode

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/611780029532 Author: Min-Zhong "John" Lu <mnjul@users.noreply.github.com> Desc: Merge pull request #20648 from mnjul/bug_1024845_lockscreen_asset_swap Bug 1024845 - Lockscreen Visual Refresh follow-up: Assets Swap. r=gweng ======== https://hg.mozilla.org/integration/gaia-central/rev/c82f744b416b Author: John Lu [:mnjul] <jlu@mozilla.com> Desc: Bug 1024845 - Lockscreen Visual Refresh follow-up: Assets Swap

Merge m-c to b2g-inbound a=merge