B2G Bumper Bot
387f7b6b49
Bumping manifests a=b2g-bump
2015-07-28 23:47:32 -07:00
B2G Bumper Bot
e9fa26a3d5
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a032af293d40
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #31140 from KevinGrandon/bug_1181419_debug_test
Bug 1181419 - Remove "quick" client from failing at startup
========
https://hg.mozilla.org/integration/gaia-central/rev/ec74dc862376
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1181419 - Remove "quick" client from failing at startup
2015-07-28 23:45:35 -07:00
B2G Bumper Bot
5bf827a125
Bumping manifests a=b2g-bump
2015-07-28 19:52:32 -07:00
B2G Bumper Bot
db34e500a3
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f498911b6b89
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #30991 from hfiguiere/bug1184246-exif-fix-ifd-offset
Bug 1184246 - Properly set the offset for the IFD data. r=djf
========
https://hg.mozilla.org/integration/gaia-central/rev/dc29ba0a7d52
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 1184246 - Properly set the offset for the IFD data.
2015-07-28 19:50:32 -07:00
B2G Bumper Bot
d7540cdcf8
Bumping manifests a=b2g-bump
2015-07-28 18:58:04 -07:00
B2G Bumper Bot
f2419fd26a
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/eef30d0a841a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1168948 - Adding preview card r=benfrancis"
This reverts commit 6f1656fda1ef6187a0298fe968448542f33245c3.
2015-07-28 18:56:05 -07:00
B2G Bumper Bot
9424f2a5f9
Bumping manifests a=b2g-bump
2015-07-28 16:59:36 -07:00
B2G Bumper Bot
9c565c7e44
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8b637bb5a1ec
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #31143 from KevinGrandon/bug_1188459_revert_smoketest_blocker_2
Revert "Bug 1186587 - Don't ensure() the homescreen for every Service.query('getHomescreen') r=kgrandon"
========
https://hg.mozilla.org/integration/gaia-central/rev/84c6eec226bb
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1186587 - Don't ensure() the homescreen for every Service.query('getHomescreen') r=kgrandon"
This reverts commit 62d9420fc0915ab11ad5d23e105c929d4b5afae6.
2015-07-28 16:56:04 -07:00
B2G Bumper Bot
cc5e5a9282
Bumping manifests a=b2g-bump
2015-07-28 16:33:09 -07:00
B2G Bumper Bot
593670dc84
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/dd53699bff64
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #31141 from nullaus/bug1188648
Bug 1188648 - Always use --host-log to save gecko output to gecko-out…
========
https://hg.mozilla.org/integration/gaia-central/rev/2f0e49d121e0
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: bug 1188648 - Always use --host-log to save gecko output to gecko-output.log. r=gaye
2015-07-28 16:31:05 -07:00
B2G Bumper Bot
b3a4c9ed65
Bumping manifests a=b2g-bump
2015-07-28 16:13:04 -07:00
B2G Bumper Bot
ccd9577e5f
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ed8a062b394d
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #31121 from zbraniecki/1188162-long-month-on-lockscreen
Bug 1188162 - Switch back to long month names on Lockscreen. r=gweng, gsvelto, ux=amylee
========
https://hg.mozilla.org/integration/gaia-central/rev/f5219941a1ec
Author: Zibi Braniecki <gandalf@mozilla.com>
Desc: Bug 1188162 - Switch back to long month names on Lockscreen
2015-07-28 16:10:40 -07:00
B2G Bumper Bot
dfb4b1f9f4
Bumping manifests a=b2g-bump
2015-07-28 15:47:42 -07:00
B2G Bumper Bot
03fdd751cb
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/44c04a44dac5
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #31139 from nullaus/bug1188585
Bug 1188585 - Set maxBuffer when calling exec. r=gaye
========
https://hg.mozilla.org/integration/gaia-central/rev/d33a7c76a9eb
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: Bug 1188585 - Set maxBuffer when calling exec. r=gaye
2015-07-28 15:45:37 -07:00
B2G Bumper Bot
ac2b8e7d04
Bumping manifests a=b2g-bump
2015-07-28 15:22:13 -07:00
B2G Bumper Bot
0c9b2581e3
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b065c0a074ce
Author: Eli Perelman <eli@eliperelman.com>
Desc: Merge pull request #31056 from eliperelman/bug-1185644
Bug 1185644 - Removing Raptor from Gaia
========
https://hg.mozilla.org/integration/gaia-central/rev/9ea82c8ef8d2
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1185644 - Removing Raptor from Gaia
========
https://hg.mozilla.org/integration/gaia-central/rev/42a2cbc3a41c
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Merge pull request #31127 from gabrielesvelto/bug-1187819-relaunch-the-homescreen-when-killed
Bug 1187819 - When trying to display the homescreen always ensure that it's launched r=etienne
========
https://hg.mozilla.org/integration/gaia-central/rev/6f1eb4d8915a
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 1187819 - When trying to display the homescreen always ensure that it's launched r=etienne
2015-07-28 15:20:12 -07:00
B2G Bumper Bot
90a876205c
Bumping manifests a=b2g-bump
2015-07-28 13:23:04 -07:00
B2G Bumper Bot
072670be57
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/5ec7add1a5ed
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #30525 from wilsonpage/1054239
Bug 1054239 - [system][notifications-tray] Swiping up anywhere on the open tray should close
========
https://hg.mozilla.org/integration/gaia-central/rev/ffd898f3e93d
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1054239 - [system][notifications-tray] Swiping up anywhere on the open tray should close
2015-07-28 13:21:04 -07:00
B2G Bumper Bot
d02a6de3b4
Bumping manifests a=b2g-bump
2015-07-28 12:37:08 -07:00
B2G Bumper Bot
150cc679a9
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/336c112c4edf
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #31025 from albertopq/1168948-pinning-preview-card2
Bug 1168948 - Adding preview card r=benfrancis
========
https://hg.mozilla.org/integration/gaia-central/rev/ea84b0a71c21
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1168948 - Adding preview card r=benfrancis
2015-07-28 12:35:08 -07:00
B2G Bumper Bot
a26e06d46a
Bumping manifests a=b2g-bump
2015-07-28 09:27:08 -07:00
B2G Bumper Bot
363fc8861b
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b176b86e412f
Author: Borja Salguero <borjasalguero@users.noreply.github.com>
Desc: Merge pull request #31116 from borjasalguero/window_open
Bug 1182509 - [Contacts][NGA] Open contacts_matching with window.open
========
https://hg.mozilla.org/integration/gaia-central/rev/04037a1d8e41
Author: jpruden92 <jorgepruden@gmail.com>
Desc: Bug 1182509 - [Contacts][NGA] Open contacts_matching with window.open
2015-07-28 09:25:07 -07:00
Carsten "Tomcat" Book
76ac43bd50
Merge mozilla-central to b2g-inbound
2015-07-28 16:44:03 +02:00
Carsten "Tomcat" Book
352596c8ac
merge mozilla-inbound to mozilla-central a=merge
2015-07-28 16:28:02 +02:00
B2G Bumper Bot
7797987436
Bumping manifests a=b2g-bump
2015-07-28 07:17:10 -07:00
B2G Bumper Bot
52ee0cf2bd
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7cab6b8d6247
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Merge pull request #31129 from mozilla-b2g/bug-1183710
Bug 1183710 - Disable test_dialer.py
========
https://hg.mozilla.org/integration/gaia-central/rev/58a84b2ed192
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Bug 1183710 - Disable test_dialer.py
========
https://hg.mozilla.org/integration/gaia-central/rev/5e7847db5683
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #31114 from mwargers/1187945
Bug 1187945 - Intermittent failure in test_dialer_add_contact.py in self.wait_for_done(return_contacts), NoSuchWindowException
========
https://hg.mozilla.org/integration/gaia-central/rev/0e12ddb8382b
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1187945 - Intermittent failure in test_dialer_add_contact.py in self.wait_for_done(return_contacts), NoSuchWindowException
2015-07-28 07:15:10 -07:00
B2G Bumper Bot
8ce053d8f1
Bumping manifests a=b2g-bump
2015-07-28 06:52:14 -07:00
B2G Bumper Bot
6fe793a567
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c198d55fd24a
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Merge pull request #30839 from JohanLorenzo/bug-1180651
Bug 1180651 - Create a job to run gaia-ui-tests against a Spark build…
========
https://hg.mozilla.org/integration/gaia-central/rev/8df547b8f544
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Bug 1180651 - Create a job to run gaia-ui-tests against a Spark build (on Flame)
2015-07-28 06:50:13 -07:00
B2G Bumper Bot
85bba3fd86
Bumping manifests a=b2g-bump
2015-07-28 05:17:37 -07:00
B2G Bumper Bot
063187988b
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/351ae6e7f699
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #31090 from mwargers/1187066
Bug 1187066 - Fix timeout failure in test_settings_change_keyboard_language.py
========
https://hg.mozilla.org/integration/gaia-central/rev/95e347802c46
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1187066 - Fix timeout failur ein test_settings_change_keyboard_language.py
2015-07-28 05:15:37 -07:00
B2G Bumper Bot
3958c4e5c5
Bumping manifests a=b2g-bump
2015-07-28 04:27:35 -07:00
B2G Bumper Bot
36953a1a86
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d1978402d0b3
Author: Luke Chang <lchang@mozilla.com>
Desc: Merge pull request #31077 from luke-chang/1182189_separate_hierarchy_focus
Bug 1182189 - Accessibility Regression in Utility tray exclusive visibility, r=johnhu
========
https://hg.mozilla.org/integration/gaia-central/rev/c4d8b88e9493
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 1182189 - Accessibility Regression in Utility tray exclusive visibility
- Separate "setFocus" from "setHierarchy" in HierarchyManager
2015-07-28 04:25:35 -07:00
B2G Bumper Bot
cecf317b7a
Bumping manifests a=b2g-bump
2015-07-28 04:13:13 -07:00
B2G Bumper Bot
75b76124d6
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0b4407c0bd39
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #31122 from aethanyc/bug1186347
Bug 1186347 - Delay calling render() until calling show(). r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/72f6c70c6f0f
Author: Ting-Yu Lin <tlin@mozilla.com>
Desc: Bug 1186347 - Fix typos in app_text_selection_dialog_test. r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/83ab83b8ce4b
Author: Ting-Yu Lin <tlin@mozilla.com>
Desc: Bug 1186347 - Remove unneeded "render when first show" test. r=timdream
We now always check render() in show().
========
https://hg.mozilla.org/integration/gaia-central/rev/7b89bdc65400
Author: Ting-Yu Lin <tlin@mozilla.com>
Desc: Bug 1186347 - Delay calling render() until calling show(). r=timdream
The old text selection dialog did the same in bug 1186313. I migrate the
patch to new selection dialog.
========
https://hg.mozilla.org/integration/gaia-central/rev/e784ce771726
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #29843 from rsajdok/bug#917045
Bug 917045 - [B2G][Email] Clicking on email address links in message bod. r=jrburke
========
https://hg.mozilla.org/integration/gaia-central/rev/25d110dffcaf
Author: Robert Sajdok <robert.sajdok@protonmail.ch>
Desc: Bug 917045 - [B2G][Email] Clicking on email address links in message bodies results in confusing/misleading prompt 'Browse to URL?: mailto:'
2015-07-28 04:10:40 -07:00
B2G Bumper Bot
5278ab4475
Bumping manifests a=b2g-bump
2015-07-28 03:45:40 -07:00
B2G Bumper Bot
5611cc9223
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/471b96c6ed9b
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #31021 from mwargers/1181662
Bug 1181662 - Fix failure in test_lockscreen_unlock_to_camera_with_passcode.py
========
https://hg.mozilla.org/integration/gaia-central/rev/927fcb29c688
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1181662 - Fix failure in test_lockscreen_unlock_to_camera_with_passcode.py
========
https://hg.mozilla.org/integration/gaia-central/rev/8e68709b033a
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #31091 from mwargers/1186985
Bug 1186985 - Increase timeout value in wait_for_received_messages
========
https://hg.mozilla.org/integration/gaia-central/rev/330c054706f0
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1186985 - Increase timeout value in wait_for_received_messages
2015-07-28 03:45:16 -07:00
B2G Bumper Bot
69ce5dc6d0
Bumping manifests a=b2g-bump
2015-07-28 00:47:36 -07:00
B2G Bumper Bot
158687fcc0
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4fc562ca01a3
Author: Evan Tseng <itoyxd@gmail.com>
Desc: Merge pull request #31075 from alastor0325/bug-1185733
Bug 1185733 - change audio channel type to system r=gsvelto
========
https://hg.mozilla.org/integration/gaia-central/rev/ae5afacdab91
Author: Alastor Wu <alwu@mozilla.com>
Desc: Bug 1185733 - change audio channel type to system
========
https://hg.mozilla.org/integration/gaia-central/rev/43cf17dec2e7
Author: Alastor Wu <alwu@mozilla.com>
Desc: Bug 1185733 - change audio channel type to system
2015-07-28 00:45:36 -07:00
B2G Bumper Bot
5fb8387ce1
Bumping manifests a=b2g-bump
2015-07-27 18:38:09 -07:00
B2G Bumper Bot
5dd250a243
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f66686ed7ca1
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #31112 from albertopq/1184672-titlebar-attention
Bug 1184672 - Showing statusbar while the tray is transitioning in the call screen r=kgrandon
========
https://hg.mozilla.org/integration/gaia-central/rev/b41a83b8d028
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1184672 - Showing statusbar while the tray is transitioning in the call screen
========
https://hg.mozilla.org/integration/gaia-central/rev/de18e33b8a5f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #31103 from KevinGrandon/bug_1187540_system_ime_gaia_checkbox
Bug 1187540 - [System] Convert IME checkbox to use gaia-checkbox
========
https://hg.mozilla.org/integration/gaia-central/rev/7ebf5038af80
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1187540 - [System] Convert IME checkbox to use gaia-checkbox
========
https://hg.mozilla.org/integration/gaia-central/rev/297eb26503b6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #31106 from KevinGrandon/bug_1181419_ftu_pseudo_localization_test
Bug 1181419 - [FTU] Guard language selection by waiting for document language to match requested language
========
https://hg.mozilla.org/integration/gaia-central/rev/6b8ae4a2ad65
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1181419 - [FTU] Guard language selection by waiting for document language to match requested language
2015-07-27 18:36:07 -07:00
B2G Bumper Bot
fcc2d7da66
Bumping manifests a=b2g-bump
2015-07-27 16:12:45 -07:00
B2G Bumper Bot
125a95d6be
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1c7ab6203042
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #31108 from mwargers/1187726
Bug 1187726 - Failure in test_sort_contacts.py in in order_by_last_name
========
https://hg.mozilla.org/integration/gaia-central/rev/19c4489d5eb8
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1187726 - Failure in test_sort_contacts.py in in order_by_last_name
2015-07-27 16:10:14 -07:00
B2G Bumper Bot
b8a5ef6c7d
Bumping manifests a=b2g-bump
2015-07-27 14:22:10 -07:00
B2G Bumper Bot
8799f3b494
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/879e2955609e
Author: punamdahiya <punamdahiya@yahoo.com>
Desc: Merge pull request #31102 from punamdahiya/Bug1157633
Bug 1157633 - [Gallery] Repeated tap on back button in fullscreen view shows blank screen r=djf
========
https://hg.mozilla.org/integration/gaia-central/rev/39fe1c647a8c
Author: Punam Dahiya <punamdahiya@yahoo.com>
Desc: Bug 1157633 - [Gallery] Repeated tap on back button in fullscreen view shows blank screen r=djf
2015-07-27 14:20:10 -07:00
B2G Bumper Bot
9e1f86735b
Bumping manifests a=b2g-bump
2015-07-27 13:47:10 -07:00
B2G Bumper Bot
e1c25f1404
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7cae606a8893
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Merge pull request #31068 from millermedeiros/1182332-expose-timer-vaani
Bug 1182332 - [Clock] expose timer functionality through IAC for the Vaani app r=mcav
========
https://hg.mozilla.org/integration/gaia-central/rev/ac018cd9ca71
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 1182332 - [Clock] expose timer functionality through IAC for the Vaani app
2015-07-27 13:45:08 -07:00
B2G Bumper Bot
a00a81b7b8
Bumping manifests a=b2g-bump
2015-07-27 10:12:44 -07:00
B2G Bumper Bot
b0c987062d
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8b7476489ad4
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #30385 from zbraniecki/1170963-remove-not-used-l10ndate-methods
Bug 1170963: Remove not used functions from l10n_date. r=stas
========
https://hg.mozilla.org/integration/gaia-central/rev/1e1ffd93c52c
Author: Zibi Braniecki <gandalf@mozilla.com>
Desc: Bug 1170963: Remove not used functions from l10n_date
========
https://hg.mozilla.org/integration/gaia-central/rev/1fa59774195d
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #30947 from TheoChevalier/new-gaia-locales
Bug 1183379 - Add Amharic (am), Upper Sorbian (hsb), Lower Sorbian (d…
========
https://hg.mozilla.org/integration/gaia-central/rev/d802e083d4bb
Author: TheoChevalier <theo.chevalier11@gmail.com>
Desc: Bug 1183379 - Add Amharic (am), Upper Sorbian (hsb), Lower Sorbian (dsb), Miahuatlán Zapotec (zam) locales to Gaia on master and 2.2 branches
2015-07-27 10:10:14 -07:00
Mike Hommey
684778963f
Bug 1186748 - Move gtk-related things in a separate mozconfig. r=mshal
...
Some mozconfigs don't include mozconfig.linux*, and don't get gtk-related
definitions, so move them in a separate mozconfig. To avoid having two
files, one for 32-bit builds and one for 64-bit builds, rely on the
includer to set PKG_CONFIG_LIBDIR appropriately.
At the same time, move all the --enable-default-toolkit=cairo-gtk2 in that
new file in the case the gtk3 package wasn't pulled from tooltool.
2015-07-28 08:19:15 +09:00
Ryan VanderMeulen
b87718f020
Merge m-c to b2g-inbound. a=merge
2015-07-27 10:43:09 -04:00