wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
186,749 Commits 1 Branch 166 Tags 1.2 GiB
2e6c5c524b
Commit Graph

10882 Commits

Author SHA1 Message Date
B2G Bumper Bot
2e6c5c524b Bumping gaia.json for 3 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/324804537eae
Author: crdlc <crdlc@tid.es>
Desc: Bug 1021518 - [Vertical Homescreen] Hitting home button on lockscreen make the homescreen goes up after unlock r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/9e0f1747ae93
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #20043 from khuey/createListItemLeak

Bug 1020685: Close only over the URL string that we need. r=bfrancis

========

https://hg.mozilla.org/integration/gaia-central/rev/c18ea8366d17
Author: Kyle Huey <khuey@kylehuey.com>
Desc: Bug 1020685: Close only over the URL string that we need. r=bfrancis
 2014-06-06 08:55:40 -07:00
B2G Bumper Bot
e57fe4015e Bumping manifests a=b2g-bump 2014-06-06 08:46:40 -07:00
B2G Bumper Bot
055d492c91 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/a8a0fd61079b
Author: Ed Morley <emorley@mozilla.com>
Desc: Revert "Bug 990035 - Modify phone-sized tutorial to show vertical-scroll, notifications & sheets video" for intermittent failures in tutorial_test.js

This reverts commit fabeaffcc637780a490cfcca023aa33ee42041f4.
 2014-06-06 08:41:10 -07:00
B2G Bumper Bot
7e691daca7 Bumping manifests a=b2g-bump 2014-06-06 08:31:31 -07:00
B2G Bumper Bot
5d677ccc16 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/823d6fd1a645
Author: gitmai <mri@tid.es>
Desc: Merge pull request #20101 from gitmai/bug-973557-button-active-while-updating

Bug 973557 -[CostControl][FTU] Update button active while is updating in...
r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/ee474e2fefe2
Author: mai <mri@tid.es>
Desc: Bug 973557 -[CostControl][FTU] Update button active while is updating information
 2014-06-06 08:26:06 -07:00
B2G Bumper Bot
be9da755b0 Bumping manifests a=b2g-bump 2014-06-06 07:36:20 -07:00
B2G Bumper Bot
c8d55e1066 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/cd7cf4b5de65
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #20095 from kamituel/Bug_1019169_byte_str_conv_fix

Bug 1019169: Fixed UTF <-> Uint8Array conversions

========

https://hg.mozilla.org/integration/gaia-central/rev/7bfd5d6c6c8e
Author: Kamil Leszczuk <kamituel@gmail.com>
Desc: Bug 1019169: Fixed UTF <-> Uint8Array conversions

========

https://hg.mozilla.org/integration/gaia-central/rev/640987fa0fde
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #19951 from guilherme-pg/bug1017203-position-throttle

Bug 1017203 - Throttle rate of position updates for Find My Device.

========

https://hg.mozilla.org/integration/gaia-central/rev/b76042eabadb
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 1017203 - Throttle rate of position updates for Find My Device.

========

https://hg.mozilla.org/integration/gaia-central/rev/afbeb40756b2
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #19780 from guilherme-pg/bug1014816-fmd-fxa-logout

Bug 1014816 - Keep Find My Device working while logged out of Firefox Accounts.

========

https://hg.mozilla.org/integration/gaia-central/rev/b0ed92f264b6
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 1014816 - Keep Find My Device working while logged out of FxA.
 2014-06-06 07:30:52 -07:00
B2G Bumper Bot
2250f25980 Bumping manifests a=b2g-bump 2014-06-06 07:26:31 -07:00
B2G Bumper Bot
1b429ae033 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/c80f20c5b211
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #20075 from guilherme-pg/bug1002581-fmd-settings-enable-geolocation

Bug 1002581 - Include new strings for enabling geolocation for Find My D...

========

https://hg.mozilla.org/integration/gaia-central/rev/f4e00e07fa61
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 1002581 - Include new strings for enabling geolocation for Find My Device.
 2014-06-06 07:21:07 -07:00
B2G Bumper Bot
8a4996c373 Bumping manifests a=b2g-bump 2014-06-06 06:56:31 -07:00
B2G Bumper Bot
4ecbe0b5d1 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/de2c586fd09a
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #20133 from vingtetun/multiple.attention.screen

Bug 988212 - Support multiple attention screens. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/77828358820c
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Bug 988212 - Support multiple attention screens. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/62f7b1d9b335
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Revert "Merge pull request #19943 from millermedeiros/1019617-week-view-am-pm"

This reverts commit 25ce8f290d921884e15f7559c0597f6b7efad419, reversing
changes made to d04b7196fb59834704ef38d400c813b7ea68d755.
 2014-06-06 06:51:06 -07:00
B2G Bumper Bot
7657c0c67c Bumping manifests a=b2g-bump 2014-06-06 06:16:23 -07:00
B2G Bumper Bot
09098d6f03 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/0ca66c85bb79
Author: BavarianTomcat <tomcat@mozilla.com>
Desc: Revert "Bug 1017327 - (Part I) Implement InputAppsTransitionManager" for breaking gaia ui tests

This reverts commit 3ebe122af79bc73da07b710af0d1fcf3d79601e7.

========

https://hg.mozilla.org/integration/gaia-central/rev/4960c4fc06e2
Author: BavarianTomcat <tomcat@mozilla.com>
Desc: Revert "Bug 1017327 - (Part II) Let KeyboardManager use it" for breaking gaia ui tests

This reverts commit 4ebaf831eb6ac05b34447e7d4c6e97adc2be1873.
 2014-06-06 06:11:16 -07:00
B2G Bumper Bot
097f476880 Bumping manifests a=b2g-bump 2014-06-06 05:46:22 -07:00
B2G Bumper Bot
2ffc78be48 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/d7535846f19d
Author: gitmai <mri@tid.es>
Desc: Merge pull request #20100 from gitmai/bug-1007590-CC-remove-balance-sms

Bug 1007590 - [Cost Control] Make Cost Control to remove balance and top...
r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/44c770cb1ed1
Author: mai <mri@tid.es>
Desc: Bug 1007590 - [Cost Control] Make Cost Control to remove balance and top-up SMS responses

========

https://hg.mozilla.org/integration/gaia-central/rev/0cd3c4c23e35
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #19949 from rnowm/power-modal-object

Bug 973827 - Power button modal should be an object menu instead of a custom implementation r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/81b25082bc79
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 973827 - Power button modal should be an object menu instead of a custom implementation

========

https://hg.mozilla.org/integration/gaia-central/rev/7de232eb5e82
Author: Albert <acperez@tid.es>
Desc: Merge pull request #19996 from acperez/bug-1020167

Bug 1020167: Add search engine configuration based on MCC/MNC

========

https://hg.mozilla.org/integration/gaia-central/rev/9848cad039b1
Author: Albert <acperez@tid.es>
Desc: Bug 1020167: Add search engine configuration based on MCC/MNC
 2014-06-06 05:41:12 -07:00
B2G Bumper Bot
59b453a3c5 Bumping manifests a=b2g-bump 2014-06-06 05:06:36 -07:00
B2G Bumper Bot
786d23947c Bumping gaia.json for 4 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/a54c3cd4cf91
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #19985 from Rik/flash-cancel-1019076

Bug 1019076 - Flash of Cancel button when opening Dialer r=drs

========

https://hg.mozilla.org/integration/gaia-central/rev/7e4aa353b348
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 1019076 - Flash of Cancel button when opening Dialer

========

https://hg.mozilla.org/integration/gaia-central/rev/e6b8d63eeb7b
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #20001 from stasm/1016026-qps-plocm-settings

Bug 1016026 - Add qps-plocm to the list of RTL locales in the Language panel. r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/058d601c76b0
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1016026 - Add qps-plocm to the list of RTL locales in the Language panel. r=arthurcc
 2014-06-06 05:01:10 -07:00
B2G Bumper Bot
9c1d685029 Bumping manifests a=b2g-bump 2014-06-06 03:28:07 -07:00
B2G Bumper Bot
9cbeae63d0 Bumping manifests a=b2g-bump 2014-06-06 03:13:05 -07:00
B2G Bumper Bot
32321add7e Bumping manifests a=b2g-bump 2014-06-06 02:51:19 -07:00
B2G Bumper Bot
968cce911a Bumping gaia.json for 3 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/70630498ae2c
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #19849 from timdream/input-manage-transition

Bug 1017327 - Isolate keyboard transition management to another module, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/6147617245ac
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1017327 - (Part II) Let KeyboardManager use it

========

https://hg.mozilla.org/integration/gaia-central/rev/be5096ead476
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1017327 - (Part I) Implement InputAppsTransitionManager
 2014-06-06 02:46:18 -07:00
B2G Bumper Bot
f645bc3d5b Bumping manifests a=b2g-bump 2014-06-06 02:21:24 -07:00
B2G Bumper Bot
5110bcf066 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/c9704b92fb86
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #20073 from pacorampas/placeholder-message-1016541

Bug 1016541 - Thread and Composer. The input placeholder text (Message) should be italic. r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/f0920b816224
Author: Paco Rampas <pacorampas@gmail.com>
Desc: Bug 1016541 - Thread and Composer. The input placeholder text (Message) should be italic
 2014-06-06 02:16:28 -07:00
B2G Bumper Bot
a4561a4b56 Bumping manifests a=b2g-bump 2014-06-06 01:26:31 -07:00
B2G Bumper Bot
17dd6401bd Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/b33df7202f63
Author: lissyx <lissyx+github@lissyx.dyndns.org>
Desc: Merge pull request #19940 from lissyx/bug959195

Bug 959195 - Show user prompt on low battery before applying update r=etienne_s

========

https://hg.mozilla.org/integration/gaia-central/rev/1a599a3dbaee
Author: Alexandre Lissy <lissyx+github@lissyx.dyndns.org>
Desc: Bug 959195 - Show user prompt on low battery before applying update
 2014-06-06 01:21:08 -07:00
B2G Bumper Bot
4f32ee51d0 Bumping manifests a=b2g-bump 2014-06-06 01:18:18 -07:00
B2G Bumper Bot
202fc63f46 Bumping manifests a=b2g-bump 2014-06-06 01:01:37 -07:00
B2G Bumper Bot
0c633a4ed0 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/d9eb271e0b0e
Author: Min-Zhong "John" Lu <mnjul@users.noreply.github.com>
Desc: Merge pull request #20115 from mnjul/bug_1021479_lockscreen_visual_arrow_size

Bug 1021479 - [VsD Refresh] Lockscreen Visual Refresh: Slider arrow size; r=gweng
Merged even though Travis didn't pass; the failing Marionette tests were expected to fail, see https://groups.google.com/forum/#!topic/mozilla.dev.gaia/JQeF6PrVlrw

========

https://hg.mozilla.org/integration/gaia-central/rev/f19a639e28f3
Author: John Lu [:mnjul] <jlu@mozilla.com>
Desc: Bug 1021479 - [VsD Refresh] Lockscreen Visual Refresh: Slider arrow size

========

https://hg.mozilla.org/integration/gaia-central/rev/a282c5349b37
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #19973 from alivedise/bugzilla/1016334_2.0/homescreen-activity-window-home-event

Bug 1016334 - Do not change url of homescreen if there is front window, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/1d49dea83d04
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 1016334 - Do not change url of homescreen if there is front window
 2014-06-06 00:56:07 -07:00
B2G Bumper Bot
73ece399b1 Bumping manifests a=b2g-bump 2014-06-06 00:46:41 -07:00
B2G Bumper Bot
4b862a36b8 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/eea6a5ec9a70
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #19984 from DouglasSherk/1020140-phone-input

Bug 1020140 - [Visual Refresh][Dialer] Make phone number input field unselectable. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/d2532b563a8f
Author: DouglasSherk <github@sherk.me>
Desc: Bug 1020140 - [Visual Refresh][Dialer] Make phone number input field unselectable. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/1b11ed7be3e8
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #18641 from stasm/1000852-video-mozL10n.once

Bug 1000852 - Clean up bootstrap mozL10n API use in Video. r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/138e9e076f56
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1000852 - Clean up bootstrap mozL10n API use in Video
 2014-06-06 00:41:09 -07:00
B2G Bumper Bot
3f4cab26c0 Bumping manifests a=b2g-bump 2014-06-06 00:21:14 -07:00
B2G Bumper Bot
4640ef62dd Bumping gaia.json for 4 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/25f9411c7656
Author: viorelaioia <viorelaioia@gmail.com>
Desc: Merge pull request #20105 from dchunwong/fixcamera

Bug 1021034 - [flame] Investigate failure in test_camera_flash_modes.py

========

https://hg.mozilla.org/integration/gaia-central/rev/61ed086c8f99
Author: Dylan Chun Wong <d.chunwong@gmail.com>
Desc: Bug 1021034 - [flame] Investigate failure in test_camera_flash_modes.py

========

https://hg.mozilla.org/integration/gaia-central/rev/50f584cb3165
Author: viorelaioia <viorelaioia@gmail.com>
Desc: Merge pull request #20099 from dchunwong/fixgallery

Bug 1021027 - [Flame] Investigate failure in gallery tests

========

https://hg.mozilla.org/integration/gaia-central/rev/bf0a7c48effa
Author: Dylan Chun Wong <d.chunwong@gmail.com>
Desc: Bug 1021027 - [Flame] Investigate failure in gallery tests
 2014-06-06 00:16:14 -07:00
B2G Bumper Bot
7f1830581b Bumping manifests a=b2g-bump 2014-06-06 00:06:32 -07:00
B2G Bumper Bot
17f95d1c9a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/0940a7797002
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #20070 from crdlc/bug-1020155

Bug 1020155 - Populate collection datastore with data defined in pre_ins...

========

https://hg.mozilla.org/integration/gaia-central/rev/d047fa4b0884
Author: crdlc <crdlc@tid.es>
Desc: Bug 1020155 - Populate collection datastore with data defined in pre_installed_collections.json
 2014-06-06 00:01:06 -07:00
B2G Bumper Bot
11f17114f8 Bumping manifests a=b2g-bump 2014-06-05 23:36:37 -07:00
B2G Bumper Bot
a0bf242330 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/aed61c4d507f
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #20048 from snowmantw/issue1020728

Bug 1020728 - [System] Pre-launching LockScreen while the screen off

========

https://hg.mozilla.org/integration/gaia-central/rev/648a92bbf59e
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1020728 - [System] Pre-launching LockScreen while the screen off
 2014-06-05 23:31:12 -07:00
B2G Bumper Bot
9b3c01e23c Bumping manifests a=b2g-bump 2014-06-05 21:06:22 -07:00
B2G Bumper Bot
1d8b5ca9f6 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/b859207fe404
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #19477 from steveck-chung/bug-1003820

Bug 1003820 - [Messages] Recipients container grows without limit breaking the layout. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/72a245a5ab6f
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 1003820 - [Messages] Recipients container grows without limit breaking the layout
 2014-06-05 21:00:33 -07:00
B2G Bumper Bot
4d32617ddb Bumping manifests a=b2g-bump 2014-06-05 20:26:39 -07:00
B2G Bumper Bot
7e9d5b378f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/19367dc6b0f9
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #19874 from pacorampas/call-screen-sprites

Bug 1018167 - [Dialer][Call Screen] Change iconpad's icon r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/d9925c84a5c1
Author: Paco Rampas <pacorampas@gmail.com>
Desc: Bug 1018167 - [Dialer][Call Screen] Change iconpad's icon
 2014-06-05 20:21:09 -07:00
B2G Bumper Bot
f5937d26a1 Bumping manifests a=b2g-bump 2014-06-05 20:11:24 -07:00
B2G Bumper Bot
fc3c1bc4b2 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/ed1ad1006f3d
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1021468 - [Vertical] Prevent app entering horizontal orientation r=me
 2014-06-05 20:06:00 -07:00
B2G Bumper Bot
c56acf5f79 Bumping manifests a=b2g-bump 2014-06-05 19:31:34 -07:00
B2G Bumper Bot
dce9fcb6cc Bumping gaia.json for 1 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/912ffe0ff9e2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1016239 - Follow-up, fix dedupe.js path r=me
 2014-06-05 19:26:08 -07:00
Wes Kocher
8290d27834 Merge m-c to b2g-inbound 2014-06-05 19:16:01 -07:00
B2G Bumper Bot
41abeee94d Bumping manifests a=b2g-bump 2014-06-05 19:13:12 -07:00
B2G Bumper Bot
2320ae0bcd Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/930e9ee90d32
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20090 from KevinGrandon/bug_1021121_vertical_icon_localization

Bug 1021121 - [Vertical] Home screen icons are not localized

========

https://hg.mozilla.org/integration/gaia-central/rev/19fea43caaec
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1021121 - [Vertical] Home screen icons are not localized r=lightsofapollo
 2014-06-05 19:11:09 -07:00
B2G Bumper Bot
3b99f56fc9 Bumping manifests a=b2g-bump 2014-06-05 19:06:32 -07:00
B2G Bumper Bot
82de51325d Bumping gaia.json for 3 gaia revision(s) a=gaia-bump 
========

https://hg.mozilla.org/integration/gaia-central/rev/61075b75c71b
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #20071 from yurenju/timeout

Bug 1013585 - Intermittent gaia-build "Automation Error: mozprocess time... r=testonly

========

https://hg.mozilla.org/integration/gaia-central/rev/fcb091e32ab5
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 1013585 - Intermittent gaia-build "Automation Error: mozprocess timed out after 330 seconds running ['make', 'build-test-integration', 'NPM_REGISTRY=http://npm-mirror.pub.build.mozilla.org', 'REPORTER=mocha-tbpl-reporter'] | timed out after 330 seconds of no output

========

https://hg.mozilla.org/integration/gaia-central/rev/a5a6dd8d69a0
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 1020475 - App install progress indicator + test infra for packaged app states r=kgrandon
 2014-06-05 19:01:06 -07:00
Wes Kocher
d48f2e62a4 Merge b2g-inbound to m-c a=merge 2014-06-05 18:49:36 -07:00