Commit Graph

193185 Commits

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

https://hg.mozilla.org/integration/gaia-central/rev/59ee65ad814e
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Merge pull request #21547 from sergi/slow-settings

Bug 1024893 - [dolphin][v1.4]Entering settings app takes more than 2.2s r=yurenju r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/3b57821a90e9
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Bug 1024893 - [dolphin][v1.4]Entering settings app takes more than 2.2s
2014-07-11 07:25:29 -07:00
B2G Bumper Bot
137efeb21f Bumping manifests a=b2g-bump 2014-07-11 07:18:11 -07:00
B2G Bumper Bot
026f90a64f Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d869702f6c7b
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #21626 from vingtetun/scroll-notifications

Bug 1035073 - Can not scroll the notifications area. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/1e84c59415fe
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Bug 1035073 - Can not scroll the notifications area. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/38827d0b42d0
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #21620 from vingtetun/mozbrowsermetachange

Bug 1033364 - Support mozbrowsermetachange in the window manager. r=alive.

========

https://hg.mozilla.org/integration/gaia-central/rev/878046349011
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Bug 1033364 - Add a pref to enable/disable brandcolor. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/633fd68593d1
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Bug 1033364 - Change window layout to accomodate custom app color for the status bar. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/7a67510fb67d
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Bug 1033364 - Support mozbrowsermetachange event in app_window.js. r=alive
2014-07-11 07:18:00 -07:00
Fernando Jiménez
e15f2a1a61 Bug 1028398 - FxA will silently provide user's email to privileged apps in 2.0. Part 3: Tests. r=jedp 2014-07-11 16:13:32 +02:00
Fernando Jiménez
4643d65bf1 Bug 1028398 - FxA will silently provide user's email to privileged apps in 2.0. Part 2: Trigger forceAuth when new privileged app tries to get a FxA assertion. r=jedp" 2014-07-11 16:13:32 +02:00
Fernando Jiménez
4c2613d1f3 Bug 1028398 - FxA will silently provide user's email to privileged apps in 2.0. Part 1: Add moz-firefox-accounts permission. r=jedp, fabrice 2014-07-11 16:13:32 +02:00
B2G Bumper Bot
90365227a0 Bumping manifests a=b2g-bump 2014-07-11 07:01:28 -07:00
B2G Bumper Bot
e4fb9bbf6a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fe6ba976047d
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #21534 from mancas/bug806227

Bug 806227 - Replace shortened forms of "don't" and "won't" with "do not...

========

https://hg.mozilla.org/integration/gaia-central/rev/208cdbe918ca
Author: Manuel Casas Barrado <b.mcb@tid.es>
Desc: Bug 806227 - Replace shortened forms of "don't" and "won't" with "do not" and "will not" in descriptions in Settings app
2014-07-11 06:55:29 -07:00
Anup Kumar
4393091b8f Bug 1005209 - Warn anyone looking at the b2g-emulator stdout to look at logcat instead. r=dhylands
DONTBUILD
2014-07-09 23:15:00 -04:00
Ryan VanderMeulen
6d8cd9b1f8 Backed out changeset c3cca6dfcaa7 for landing with the wrong bug number. 2014-07-11 09:28:14 -04:00
Sam Penrose
4bdc012415 Bug 1037170 - Fire oncancel() when user cancels Sign Up/Sign In. r=jedp 2014-07-10 18:24:46 -07:00
Dimi Lee
6733826c58 Bug 1035606 - [NFC] Testcase cleanup. r=tzimmermann 2014-07-10 11:33:10 +08:00
Anup Kumar
4339f14aa2 Bug 1002509 - Warn anyone looking at the b2g-emulator stdout to look at logcat instead. r=dhylands 2014-07-09 23:15:00 -04:00
B2G Bumper Bot
71fc097b08 Bumping manifests a=b2g-bump 2014-07-11 06:16:17 -07:00
B2G Bumper Bot
fd6826c165 Bumping gaia.json for 8 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d7c77807feb0
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #21461 from guilherme-pg/bug1035321-handle-accuracy

Bug 1035321 - Send the accuracy of locations to Find My Device's server.

========

https://hg.mozilla.org/integration/gaia-central/rev/e4dea2e018dc
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 1035321 - Send the accuracy of positions to Find My Device's server.

========

https://hg.mozilla.org/integration/gaia-central/rev/4a41159ba85b
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #21591 from etiennesegonzac/bug-1034347-bis

Bug 1034347 follow up - Fixing over paint issues r=21

========

https://hg.mozilla.org/integration/gaia-central/rev/370d06eab414
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 1034347 follow up - Fixing over paint issues
While making sure
* we're not continuously creating/destroying layers during an edge gesture
* we don't reflow while quickly swiping through apps

========

https://hg.mozilla.org/integration/gaia-central/rev/005424e6e775
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #21613 from julienw/1033221-update-mozilla-download

Bug 1033221 - make mozilla-download and mozilla-get-url timeout in case ...

========

https://hg.mozilla.org/integration/gaia-central/rev/f9f04e06632c
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1033221 - make mozilla-download and mozilla-get-url timeout in case the FTP server doesn't answer r=me

Bump the version for mozilla-download

========

https://hg.mozilla.org/integration/gaia-central/rev/46a30986a7a6
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #21355 from gtorodelvalle/callscreen-bug-1018283-lockscreen-visual-refresh-revolutions

Bug 1018283 - [Follow-up 951665] Pending visual revision and adjustments callscreen-bug-1018283-lockscreen-visual-refresh-revolutions

========

https://hg.mozilla.org/integration/gaia-central/rev/f839ca378e60
Author: German Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 1018283 - [Follow-up 951665] Pending visual revision and adjustments of the VR call screen when in lockscreen
2014-07-11 06:10:29 -07:00
B2G Bumper Bot
e249118f7d Bumping manifests a=b2g-bump 2014-07-11 06:06:18 -07:00
B2G Bumper Bot
e99afa4ecb Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2161df9eb0f3
Author: gitmai <mri@tid.es>
Desc: Merge pull request #21588 from empoalp/bug_963361

Bug 963361 - Usage app shows too much white space at the bottom
r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/2ac4cfb4fdb4
Author: David Garcia <davidg@tid.es>
Desc: Bug 963361 - Usage app shows too much white space at the bottom

========

https://hg.mozilla.org/integration/gaia-central/rev/a3ee990e1037
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #21348 from pacorampas/1033970

Bug 1033970 - In multicall, Phone with the background when you click on it r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/558c2a44046c
Author: Paco Rampas <pacorampas@gmail.com>
Desc: Bug 1033970 - Line not complete highlighted when tapping on a participant in a multiparty call
2014-07-11 06:00:35 -07:00
Fernando Jiménez
8967b7990c Bug 1033238 - Cannot revoke Mobile ID permission. r=jedp 2014-07-11 14:56:57 +02:00
Fernando Jiménez
8c424f261b Bug 1023780 - Ensure that Mobile ID client support the 401/110 error (invalid token) properly. r=jedp 2014-07-11 14:56:56 +02:00
B2G Bumper Bot
967bbe78dc Bumping manifests a=b2g-bump 2014-07-11 05:51:19 -07:00
B2G Bumper Bot
fa961b6d63 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/798ac2c58dbf
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #21585 from viorelaioia/bug_1036962

Bug 1036962 - Replace time.sleep(5) in test_settings_power_save_mode.py ...

========

https://hg.mozilla.org/integration/gaia-central/rev/2918e110f0dc
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1036962 - Replace time.sleep(5) in test_settings_power_save_mode.py with a suitable wait
2014-07-11 05:45:34 -07:00
B2G Bumper Bot
2141e3f447 Bumping manifests a=b2g-bump 2014-07-11 04:06:50 -07:00
B2G Bumper Bot
f5d96cecdf Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f0b67dc48e81
Author: Fernando Campo <fcampo@users.noreply.github.com>
Desc: Merge pull request #21190 from fcampo/settings-sms-935891

Bug 935891 - [Settings] show MSMC on Messages panel (r=arthurcc)

========

https://hg.mozilla.org/integration/gaia-central/rev/80843997d76f
Author: Fernando Campo <fernando.campo@telefonica.com>
Desc: Bug 935891 - [Settings] show MSMC on Messages panel
2014-07-11 04:05:29 -07:00
B2G Bumper Bot
3df43f814a Bumping manifests a=b2g-bump 2014-07-11 03:16:20 -07:00
B2G Bumper Bot
44d67ed419 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d1da19b92a06
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #21402 from pivanov/bug-1034271

Bug 1034271 - [SMS] Background graphic is out of date r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/fe37589bf9f9
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1034271 - [SMS] Background graphic is out of date
2014-07-11 03:05:28 -07:00
B2G Bumper Bot
0eaab74c27 Bumping manifests a=b2g-bump 2014-07-11 02:56:16 -07:00
B2G Bumper Bot
c76ef58b18 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e78d7cdd6e73
Author: pacorampas <b.frv@tid.es>
Desc: Merge pull request #20418 from pacorampas/ghost-count-button-dialer-1018494

Bug 1018494 - [B2G][Dialer] On the dialer app screen after the suggestions list is empty, tapping where the result count was, will still opens the overlay menu. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/124d8d641531
Author: Paco Rampas <pacorampas@gmail.com>
Desc: Bug 1018494 - [B2G][Dialer] On the dialer app screen after the suggestions list is empty, tapping where the result count was, will still opens the overlay menu.
2014-07-11 02:50:31 -07:00
Albert Crespell
9222a68166 Bug 1034490: Optimize saveStats function of NetworkStatsDB. 2014-07-11 07:02:59 +02:00
B2G Bumper Bot
d45954a4a7 Bumping manifests a=b2g-bump 2014-07-11 01:46:20 -07:00
B2G Bumper Bot
22929eacf5 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d2bc1987e88b
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #21473 from timdream/keyboard-multitouch-update

Bug 985855 - Commit first targets when there is a second press, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/5a64d1aa9121
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 985855 - (Part III) Commit first targets when there is a second press

========

https://hg.mozilla.org/integration/gaia-central/rev/62045dbde987
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 985855 - (Part II) Count the number of touchstart events on a target

========

https://hg.mozilla.org/integration/gaia-central/rev/9b943a6fafc4
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 985855 - (Part I) Ensure active targets are always ended up committed
2014-07-11 01:40:29 -07:00
Vicamo Yang
f19efaa42d Bug 1036877: add private dtor for Reference-counted RIL components. r=hsinyi 2014-07-11 15:58:01 +08:00
B2G Bumper Bot
61a4290b44 Bumping manifests a=b2g-bump 2014-07-11 00:51:19 -07:00
B2G Bumper Bot
7770347ac6 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/557dccc348a3
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #21582 from mancas/bug1036805

Bug 1036805 - [Settings] Too many time options for passcode lock require activate time, r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/a2f65e561181
Author: Manuel Casas Barrado <mancas.91@gmail.com>
Desc: Bug 1036805 - [Settings] Too many time options for passcode lock require activate time

========

https://hg.mozilla.org/integration/gaia-central/rev/ee99d1b4ae99
Author: Salvador de la Puente González <salva@unoyunodiez.com>
Desc: Merge pull request #21530 from mancas/bug1030377

Bug 1030377 - Search clear button is not labeled for accessibility
r=dale

========

https://hg.mozilla.org/integration/gaia-central/rev/742ee3a07d67
Author: Manuel Casas Barrado <b.mcb@tid.es>
Desc: Bug 1030377 - Search clear button is not labeled for accessibility

========

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

Bug 1036368 - Javascript errors when icons are removed while they are be...

========

https://hg.mozilla.org/integration/gaia-central/rev/9625ffe97540
Author: crdlc <crdlc@tid.es>
Desc: Bug 1036368 - Javascript errors when icons are removed while they are being decorated
2014-07-11 00:45:33 -07:00
Thomas Zimmermann
e54dcfd3a7 Bug 1035240: Close file descriptor in BluetoothSocket, r=shuang
Currently, BluetoothSocket leaks its file descriptor on close
operations. With this patch when Gecko closes an instance of
BluetoothSocket, the file descriptor is now closed as well.
2014-07-11 09:22:51 +02:00
B2G Bumper Bot
7c253f0956 Bumping manifests a=b2g-bump 2014-07-10 23:56:15 -07:00
B2G Bumper Bot
92c3df52cc Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

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

Bug 1036336 - [Collection App] Icons jump after rendering all of them

========

https://hg.mozilla.org/integration/gaia-central/rev/7bc977a7fef8
Author: crdlc <crdlc@tid.es>
Desc: Bug 1036336 - [Collection App] Icons jump after rendering all of them

========

https://hg.mozilla.org/integration/gaia-central/rev/67b3a1c8ae3d
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #21161 from crdlc/bug-1031254

Bug 1031254 - [Vertical Homescreen] Add configure button in context menu

========

https://hg.mozilla.org/integration/gaia-central/rev/07324d152174
Author: crdlc <crdlc@tid.es>
Desc: Bug 1031254 - [Vertical Homescreen] Add configure button in context menu

========

https://hg.mozilla.org/integration/gaia-central/rev/8399ff794e75
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #21533 from crdlc/bug-1036359

Bug 1036359 - After clicking on "save bookmark" button there is a javasc...

========

https://hg.mozilla.org/integration/gaia-central/rev/b74aea827fcf
Author: crdlc <crdlc@tid.es>
Desc: Bug 1036359 - After clicking on "save bookmark" button there is a javascript error
2014-07-10 23:50:30 -07:00
B2G Bumper Bot
bfd80aadc1 Bumping manifests a=b2g-bump 2014-07-10 23:41:13 -07:00
B2G Bumper Bot
65b2dbbf6a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6f63b10d567e
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #21601 from dominickuo/bug-1036402

Bug 1036402 - [System] Only change the SCO volume when SCO is connected, r=alivedise

========

https://hg.mozilla.org/integration/gaia-central/rev/3f82cab4bbed
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 1036402 - [System] Only change the SCO volume when SCO is connected
2014-07-10 23:35:29 -07:00
B2G Bumper Bot
de0be0f6bd Bumping manifests a=b2g-bump 2014-07-10 19:41:14 -07:00
B2G Bumper Bot
44fce4cf54 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/cd19027a1372
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #21519 from timdream/keyboard-hint-wait

Bug 957031 - 100ms delay for keyboard key highlight, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/1a12292cb81b
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 957031 - 100ms delay for keyboard key highlight
2014-07-10 19:35:30 -07:00
B2G Bumper Bot
55286704a1 Bumping manifests a=b2g-bump 2014-07-10 19:26:12 -07:00
B2G Bumper Bot
6f3cec4950 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5e89703149a4
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1010415 - Disable intermittent notification_resend_test.js | mozChromeNotifications: Sending one notification, remove from tray, resend
2014-07-10 19:20:29 -07:00
B2G Bumper Bot
44d855a7bc Bumping manifests a=b2g-bump 2014-07-10 18:11:14 -07:00
B2G Bumper Bot
314e7f55c6 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1035928 - TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/app_usage_metrics_test.js | App Usage Metrics > Uninstalled apps are counted

========

https://hg.mozilla.org/integration/gaia-central/rev/8f15953339ed
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1035928 - TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/app_usage_metrics_test.js | App Usage Metrics > Uninstalled apps are counted r=marshall_law
2014-07-10 18:05:29 -07:00
B2G Bumper Bot
a311dce6d8 Bumping manifests a=b2g-bump 2014-07-10 17:56:12 -07:00
B2G Bumper Bot
682a9bfd9d Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/afa69c934fa1
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #21456 from cctuan/1035010

Bug 1035010 - [edge gestures] Unlocalized App name appear while switching App (without changing locale after reboot)

========

https://hg.mozilla.org/integration/gaia-central/rev/f0f549a632a1
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 1035010 - [edge gestures] Unlocalized App name appear while switching App (without changing locale after reboot)

========

https://hg.mozilla.org/integration/gaia-central/rev/ca48edf0ffa7
Author: Jared Hirsch <ohai@6a68.net>
Desc: Merge pull request #21506 from 6a68/bug-1034331-fxa-coppa-progress-bar

Bug 1034331 - Decrement fxa step count when going back from COPPA screen...

========

https://hg.mozilla.org/integration/gaia-central/rev/2e39a7c3a854
Author: Jared Hirsch <ohai@6a68.net>
Desc: Bug 1034331 - Decrement fxa step count when going back from COPPA screen to enter email screen. r=ferjm

    Also: only increment the fxa step count if moving forward in the flow.
2014-07-10 17:50:29 -07:00
B2G Bumper Bot
8769a71e18 Bumping manifests a=b2g-bump 2014-07-10 16:01:58 -07:00
B2G Bumper Bot
95e9038fb2 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/832854832480
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #21546 from julienw/1033472-improve-node-modules-dependencies

Bug 1033472 - Gaia linter, gaia-build tests aren't using NODE_MODULES_GI...

========

https://hg.mozilla.org/integration/gaia-central/rev/bf5f862ee2a5
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1033472 - Gaia linter, gaia-build tests aren't using NODE_MODULES_GIT_URL and so connect to Github ("make: *** [node_modules] Error 2") r=yurenju

This changes how the node_modules directory is generated. Indeed, we don't use
the temporary directory as a direct dependency now, because its name can change
and we don't need to run the new target if the name changes.

========

https://hg.mozilla.org/integration/gaia-central/rev/e1d948755673
Author: Marshall Culpepper <marshall.law@gmail.com>
Desc: Merge pull request #21470 from marshall/bug1035520_ftuPingSystemV2

Bug 1035520: Make FtuPing instantiable. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/0ae4b0fea9d6
Author: Marshall Culpepper <marshall@mozilla.com>
Desc: Bug 1035520: Make FtuPing instantiable. r=alive
2014-07-10 16:00:44 -07:00
Ryan VanderMeulen
6199750f94 Merge inbound to m-c on a CLOSED TREE. a=merge 2014-07-10 18:22:38 -04:00
Ryan VanderMeulen
ca6a1228e6 Merge b2g-inbound to m-c. a=merge 2014-07-10 18:09:42 -04:00