From 471fbce5fb0137f64582fc6a200c8df074ac7d81 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 10 Feb 2015 02:46:38 -0800 Subject: [PATCH] Bumping gaia.json for 14 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/df1a26071642 Author: Chris Lord Desc: Merge pull request #28075 from Cwiiis/bug1129186-homescreen-rtl-placeholders Bug 1129186 - Fix placeholders being misplaced in RTL. r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/ae0f88501a89 Author: Chris Lord Desc: Bug 1129186 - Fix placeholders being misplaced in RTL. r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/f9092f600dab Author: autolander Desc: Bug 1127318 - merge pull request #27963 from ythej:bug_1127318 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/e8ebc44db680 Author: Vishnu Teja Desc: Bug 1127318 - Contacts with only a last name and a phone number in Gmail will be displayed as {phoneNumber} {LastName} while importing contacts from Gmail r=Francisco Jordano ======== https://hg.mozilla.org/integration/gaia-central/rev/3df43b1f9dda Author: autolander Desc: Bug 1131447 - merge pull request #28111 from shamenchens:Bug1131447-FlingPlayerGaiaLoading to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/6fbd90ee8c1f Author: Sherman Chen Desc: Bug 1131447 - Add gaia-loading component to fling player ======== https://hg.mozilla.org/integration/gaia-central/rev/ee09a74fd358 Author: autolander Desc: Bug 1117314 - merge pull request #27917 from etiennesegonzac:bug-1117314 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/2d38fdeca30d Author: Etienne Segonzac Desc: Bug 1117314 - The SoftwareHomeButtonManager only listens to system wide events when the SHB is enabled r=gmarty ======== https://hg.mozilla.org/integration/gaia-central/rev/6cffbe2f4449 Author: autolander Desc: Bug 1131024 - merge pull request #28072 from KevinGrandon:bug_1131024_launching_private_window_message to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/8296144e7872 Author: Kevin Grandon Desc: Bug 1131024 - [System] Move private browser trigger into browser.js, handle private-window request r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/47cb166fcb42 Author: autolander Desc: Bug 1119398 - merge pull request #28001 from mikehenrty:bug-1119398-rtl-net-error to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/80b0c137e2f8 Author: Michael Henretty Desc: Bug 1119398 - Correct background position of settings icon in RTL ======== https://hg.mozilla.org/integration/gaia-central/rev/6106ef6308b7 Author: autolander Desc: Bug 1100298 - merge pull request #27888 from KevinGrandon:bug_1100298_remove_learn_more_link to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/ca44de88afdc Author: Kevin Grandon Desc: Bug 1100298 - [PrivateBrowser] Update private browsing page content --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 4ec811f701c5..47b7f064ee73 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "1f366169afcb84af4356980d95b9fda69098c168", + "git_revision": "170d093483cbdb4c7f27b620f68a822f42e76f98", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "6b6c4afccfdac0f83fed0218535ccc24a299322a", + "revision": "df1a26071642b8090716db4e9d2b8599947a0ed3", "repo_path": "integration/gaia-central" }