Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
authorB2G Bumper Bot <release+b2gbumper@mozilla.com>
Wed, 03 Feb 2016 01:27:15 -0800
changeset 292636 c8f474cf62d38f25d153f32079c63f4c559013de
parent 292635 1466bfc87e1c9fdf4188edc3276550cc8db33738
child 292637 65101373d1f7f52cab20387e5ca6f916fc5b4421
push id296
push userffxbld
push dateWed, 03 Feb 2016 09:29:14 +0000
reviewersgaia-bump
bugs1242363
milestone44.0
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-2_5/rev/f7de7987a1b7 Author: Rex KM Lee <rexboy@mozilla.com> Desc: Merge pull request #34024 from rexboy7/1242363-v2.5 Bug 1242363 - [TV][2.5] Popup a prompt message when receiving a Send-…r=lchang ======== https://hg.mozilla.org/integration/gaia-2_5/rev/9e20693d8bfb Author: Rex Lee <rexboy@mozilla.com> Desc: Bug 1242363 - [TV][2.5] Popup a prompt message when receiving a Send-to-TV request. Conflicts: tv_apps/smart-system/js/app_window_factory.js
b2g/config/gaia.json
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "cca8c1aa0c4e0765a39d4f9dff75b63235919f07", 
+        "git_revision": "cb4efe4e01290a9a36e340da34568fcf64be7b90", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "71b623de48cd655d605a1f745759e56b48b7c808", 
+    "revision": "f7de7987a1b743bf25138afce27fe2f68a5a307b", 
     "repo_path": "integration/gaia-2_5"
 }