Commit Graph

28762 Commits

Author SHA1 Message Date
Chris Pearce
21140badcb Bug 1265928 - Hide Adobe GMP on Windows XP. r=spohl,a=lizzard
We need to revert bug 1234099 so that we don't show the plugin in
the add-on manager on Windows XP, since now that unencrypted decoding
via Adobe GMP is disabled, we won't be using the Adobe GMP.

MozReview-Commit-ID: FWRSQaTXBY3
2016-04-19 17:05:10 -07:00
Chris H-C
08b33646fe bug 1265000 - Record dom.max_script_run_time pref in Telemetry Environment. data=bsmedberg, r=felipe, a=ritu
Users who have this pref set to a non-default value have a different slow
script experience than the others.

This preference is generally set as a flag: it is only ever changed at most
one time in a profile, so it shouldn't appreciably increase subsession splits.

MozReview-Commit-ID: FoQXvd9eSh
2016-04-15 12:16:09 -04:00
Ted Mielczarek
0ee2bee94f Bug 1264242 - Write memory info streams for Windows Minidumps of child processes. r=bsmedberg, a=ritu
MozReview-Commit-ID: COHFdNiJIqm
2016-04-13 08:05:46 -04:00
Michael Comella
5f74680674 Bug 1249288 - Update telemetry docs to include defaultSearch. r=gfritzsche,rnewman a=ritu
MozReview-Commit-ID: 4pihITjabns
2016-03-10 16:23:13 -08:00
Bill McCloskey
59e4188498 Bug 1260908 - Record IPC message sizes. r=dvander, a=ritu
MozReview-Commit-ID: Gw0Ov64iJSx
***
Bug 1260908 - Fix type of kMinTelemetryMessageSize. r=smaug a=ritu

MozReview-Commit-ID: 3ex89qCbRfJ
2016-04-14 09:22:44 -07:00
Bill McCloskey
cb49c48762 Bug 1260908 - Allow keyed histograms to accumulate early in startup. r=gfritzsche, a=ritu
MozReview-Commit-ID: 4pVxMyOajB5
2016-03-30 15:25:18 -07:00
Andrea Marchesini
37cca31e20 Bug 1259169 - "nsICookieManager::remove() should be back-compatible for 1 or 2 releases." r=sicking, a=ritu 2016-04-14 05:39:00 +02:00
Josh Matthews
bcafe812fb Bug 1255576 - Propagate privacy status for removed content preferences to observers. r=adw, a=ritu 2016-04-04 15:25:58 -04:00
Bob Owen
6aa0237d95 Bug 1256992 Part 2: Move SandboxBroker Initialization earlier and add telemetry and extra null checks. r=aklotz, a=ritu
MozReview-Commit-ID: Fu05wLn27UG
2016-04-07 08:28:14 +01:00
Bob Owen
cc49fd5338 Bug 1256992: Initialize Windows sandbox BrokerServices before any child processes are created. r=aklotz, r=bholley, a=ritu 2016-04-13 15:37:35 +01:00
Gijs Kruitbosch
9b6d4841f4 Bug 1262772 - html checkboxes in in-content pages should stop taking pointer events because they're hidden, r=jaws, a=lizzard
MozReview-Commit-ID: 6UC5sYmDHOU
2016-04-07 11:40:11 +01:00
Carsten "Tomcat" Book
611f4cad0d Backed out changeset 6bba1d23fd2c (bug 1256992) for problems in conflict resolution 2016-04-13 16:23:59 +02:00
Carsten "Tomcat" Book
f941ff23d8 Backed out changeset 727c6549ed88 (bug 1256992) 2016-04-13 16:23:30 +02:00
Bob Owen
f222b069b5 Bug 1256992 Part 2: Move SandboxBroker Initialization earlier and add telemetry and extra null checks. r=aklotz, a=ritu
MozReview-Commit-ID: Fu05wLn27UG
2016-04-07 08:28:14 +01:00
Bob Owen
38ac893967 Bug 1256992: Initialize Windows sandbox BrokerServices before any child processes are created. r=aklotz, r=bholley, a=ritu 2016-03-23 08:10:43 +00:00
Xidorn Quan
08fdabbbc1 Bug 1260102 - Pass isHandlingUserInput through process boundary for content menu command. r=mrbkap, a=ritu
MozReview-Commit-ID: FMQOFpeO6yn
2016-03-29 14:58:43 +11:00
Cykesiopka
5e169a1449 Bug 1247798 - Make nsUrlClassifierDBService::Init() register pref observers only in the success case. r=gcp, a=ritu
These observers should only be added when everything else has succeeded.
Failing to do so can cause long shutdown hangs in certain situations such as during periodic HSTS update runs.

MozReview-Commit-ID: IoJ4PscS1u3
2016-04-03 00:58:43 -07:00
Patrick McManus
ed40e62325 Bug 1262572 - http 0.9 telemetry. r=hurley, a=ritu 2016-04-06 14:54:47 -04:00
Cervantes Yu
5b2da66acb Bug 1257486 - Annotate global memory status in the crash reporter for child process; r=bsmedberg, a=ritu
MozReview-Commit-ID: ExVZS3aAp41
2016-03-29 19:16:09 +08:00
Ryan VanderMeulen
fe6093db2c Backed out changesets dc41aaa31b35 and 9bececc0ade4 (bug 1260908) for Werror bustage. 2016-04-09 13:44:10 -04:00
Felipe Gomes
c0288049de Bug 1260190 - Disable e10s for accessibility users on OS X. r=jimm, a=ritu
MozReview-Commit-ID: 35KZiKcSFqL
2016-04-01 15:54:33 -03:00
Bill McCloskey
8474fcb90c Bug 1260908 - Record IPC message sizes. r=dvander, a=ritu 2016-03-30 15:25:54 -07:00
Bill McCloskey
dca95e675c Bug 1260908 - Allow keyed histograms to accumulate early in startup. r=gfritzsche, a=ritu 2016-03-30 15:25:18 -07:00
Gabor Krizsanits
d43d21b194 Bug 1247420 - Part 2: IPC hover state management for select. r=Felipc, a=ritu 2016-03-30 11:54:31 +02:00
Markus Stange
082e554b1e Bug 1068674 - Don't turn off e10s if hardware acceleration is disabled. r=jimm, a=ritu
MozReview-Commit-ID: 8NIUSSHy2dt
2016-03-22 15:09:24 -04:00
Tobias Schneider
d9f822bff9 Bug 1237198 - [experiment] Block SWFs on the content blocking list hosted on the Shavar service 0.6.9 r=francois a=ritu
MozReview-Commit-ID: 7Zgdjph7wN3
2016-04-06 16:34:08 -07:00
Gijs Kruitbosch
ad74e635f5 Bug 621158 - make appcache use messaging for quota management, r=mayhemer,jaws a=ritu
Bug 1257488 - Fix test_gzip_offline.html to work with e10s enabled, r=mayhemer

MozReview-Commit-ID: 506zXb2fLN3
2016-03-21 11:52:36 +00:00
Alessio Placitelli
8654db7493 Bug 1254550 - Make Telemetry configuration consistent across builds. r=gfritzsche, a=lizzard 2016-03-11 06:31:00 +01:00
Anthony Jones
6f403e8288 Bug 1230265 - Add VP9 benchmark telemetry; r=bsmedberg a=ritu
MozReview-Commit-ID: 6ofvNqvkg0U
2016-03-03 16:23:19 +13:00
Ed Lee
cc4aa04255 Bug 1259506 - Add telemetry probe for counting copy panel actions. r=dmose, f=bsmedberg a=ritu
MozReview-Commit-ID: FVOPN32qky7
2016-03-14 00:29:21 -07:00
Ehsan Akhgari
865edcc653 Bug 1255934 - Start collecting telemetry data on the usage of remote JAR protocol in the wild; r=mcmanus a=ritu
MozReview-Commit-ID: ARppHBl9FHz
2016-03-11 20:01:08 -05:00
George Wright
706731efc8 Bug 1255841 - Explicitly send down the child index when building select popups in the parent r=mconley a=ritu
MozReview-Commit-ID: 1MbDZu0CmQF
2016-03-18 13:38:40 -04:00
Ryan VanderMeulen
b0055baf3c Bug 1259809 - Make CrashReporter::InitChildProcessTmpDir conditional on MOZ_CRASHREPORTER. r=aklotz, a=npotb
MozReview-Commit-ID: 9PRNZDeWczV
2016-03-25 12:51:00 -04:00
Aaron Klotz
920cf5f82c Bug 1256541: Fix incorrect generation of path for child process .extra files when content sandboxing is disabled; r=bsmedberg, a=lizzard
MozReview-Commit-ID: JQgqlntQ6cu
2016-03-16 12:35:50 -06:00
Aaron Klotz
6a3b9aff95 Bug 1236108: Backout 34a219cbd67d; r=backout a=lizzard
MozReview-Commit-ID: EEYLmdZrZmN
2016-03-28 12:41:48 -06:00
Jared Wein
726ff5db66 Bug 1259108 - Increase timeout of notifications from 12s to 20s to match parity with Chromium. r=MattN a=ritu
MozReview-Commit-ID: 31RjSWuszuC
2016-03-23 12:54:57 -04:00
Jim Mathies
a13680a3ce Bug 1041599 - Maintain a single volume control session between browser, content, and plugins on Windows. r=aklotz a=ritu
MozReview-Commit-ID: 2LuYciKfsWn
2016-03-13 08:25:23 -05:00
Wes Kocher
36d7bd2f09 Backed out changeset 30de9ac21a78 (bug 1256992) for causing crashes a=backout
MozReview-Commit-ID: L30XEzrSo0y
2016-03-28 10:51:05 -07:00
Bob Owen
a82bda1031 Bug 1256992: Initialize Windows sandbox BrokerServices before any child processes are created. r=aklotz, r=bholley, a=lizzard 2016-03-23 08:10:43 +00:00
Benjamin Smedberg
16a6aff750 Bug 1257209 - record uptime in crash metadata/pings, r=gfritzsche a=ritu CLOSED TREE
MozReview-Commit-ID: 8MVRwALXvW5
2016-03-16 16:59:06 -04:00
Mike de Boer
5b52115fcc Bug 1254104: use docShellIsActive instead of introducing logic that relies on tabbrowser implementation specifics. r=evilpies a=ritu
MozReview-Commit-ID: Am706xBPQ0B
2016-03-16 12:51:50 +01:00
Benjamin Smedberg
eb266fd5f1 Bug 1187270 - Add Telemetry session ID to crash annotations, r=gfritzsche a=ritu
MozReview-Commit-ID: GwVI0dfsT4H
2016-03-14 09:31:19 -04:00
Mike Conley
1b581345d8 Bug 1256468 - sessionHistory shim should QI DocShell to nsIWebNavigation automatically. r=krizsa, a=ritu
MozReview-Commit-ID: 8benvQvcfLO
2016-03-15 19:05:24 -04:00
Jared Wein
5034e9ac82 Bug 1251809 - Add input[type=file] tooltip support for e10s. r=ehsan a=ritu IGNORE IDL
MozReview-Commit-ID: FpwKGrFQNrK
2016-03-16 19:07:51 -04:00
Felipe Gomes
e5850e1705 Bug 1257242 - Improve RTL checks to actually check for RTL instead of using a hardcoded list. r=jimm a=lizzard
MozReview-Commit-ID: 5uBNCMooB6o
2016-03-16 17:31:31 -03:00
Felipe Gomes
42f4042d38 Bug 1257242 - Split the ::BrowserTabsRemoteAutostart() function into two parts, to allow for the blocking policies to be checked independently from the prefs checks. r=jimm a=lizzard IGNORE IDL
MozReview-Commit-ID: qlfYBvHfLI
2016-03-16 17:31:14 -03:00
Marco Bonardo
26d6e60222 Bug 1252074 - test_form_autocomplete.html and test_form_autocomplete_with_list.html should pass on e10s. r=paolo, a=ritu
IGNORE IDL

MozReview-Commit-ID: CISKztr4p4N
2016-03-02 14:34:38 +01:00
Robert Helmer
207111c0fa Bug 1245376 - do not advertise updates for locked install locations r=mossop,a=ritu
MozReview-Commit-ID: EmCzFZpOGKR
2016-02-29 14:53:56 -08:00
Florian Quèze
02cc0f075d Bug 1255605 - search.json.mozlz4 should always contain search engines. r=adw, a=sledru 2016-03-14 18:45:33 +01:00
Richard Barnes
f557d18c1b Bug 1254653 - Add telemetry to measure how often we encounter EV certificates r=keeler a=ritu
MozReview-Commit-ID: FvDpMGEJGLQ
2016-03-08 17:30:40 -05:00
Bob Owen
08b29f22d1 Bug 1253850: On Windows change MOZ_DEBUG_CHILD_PROCESS back to JIT and add MOZ_DEBUG_CHILD_PAUSE for a 10 second pause. r=mchang a=ritu
MozReview-Commit-ID: 6VAVFM5l7We
2016-03-07 17:08:15 +00:00
Alessio Placitelli
d560c581ae Bug 1252869 - Fix browser_experiments.js to work with e10s. r=gfritzsche a=lizzard
MozReview-Commit-ID: 2ljJQ1Hfi9k
2016-03-07 17:21:58 +01:00
Ryan VanderMeulen
8ef0386053 Backed out changesets d59774690fc8, 26e323cbbfc0, and 1864afbb3bd4 (bug 1236108) for test_content_exception_time_annotation.js failures. 2016-03-13 21:02:58 -04:00
Florian Quèze
8d0bcd1ad8 Bug 1254694 - Fix search engines metadata migration for engines from language packs. r=adw, a=sledru 2016-03-10 21:05:05 +01:00
Florian Quèze
07b5f8b9ca Bug 1254694 - Fix synchronous code path for search engines metadata migration. r=adw, a=sledru 2016-03-10 21:04:54 +01:00
Dão Gottwald
d110f5fc78 Bug 1253584 - Fix and enable browser_NetworkPrioritizer.js for e10s. r=mconley, a=ritu 2016-03-08 12:16:42 +01:00
Aaron Klotz
f1bc95aa31 Bug 1236108 - Add support for exception-context annotations for content processes to the crash reporter. r=bsmedberg, a=lizzard
This patch redefines XP_PATH_MAX on Windows to be MAX_PATH + 1. I did this
because the longer definition would actually not work with most Windows APIs.
Some APIs can work with longer lengths if the path is prefixed with "\\?\", but
that is not guaranteed in general.

See https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx#maxpath

MozReview-Commit-ID: LhT5oM5hlkl
2016-03-07 12:48:58 -08:00
Aaron Klotz
567de8d622 Bug 1236108 - Modify sandbox initialization code to use directory service to obtain content process temp directory. r=bobowen, r=haik, a=lizzard
The previous patch in this series creates a new directory service entry
specifically for obtaining the content process temp directory.

This patch converts everything else to reference that entry. It also sets
appropriate environment variables in the content processes so that system
APIs automatically pick up the directory. This is necessary for the crash
reporter to be able to call those APIs in exception handling contexts.

MozReview-Commit-ID: DF6aNKrWnWp
2016-03-08 11:02:27 -08:00
Aaron Klotz
eac1a82f39 Bug 1236108 - Add temp directory for sandboxed content processes to directory service. r=bsmedberg, a=lizzard
This is needed so that chrome processes know where sandboxed content
processes will be writing their temp files, and so that content processes know
where to write.

MozReview-Commit-ID: BK9bTxFGvZO
2016-03-07 11:26:35 -08:00
Chris Pearce
3eb15f805b Bug 1254942 - Redo sanity check whenever buildId changes. r=mchang,a=ritu
MozReview-Commit-ID: 826Mt89OuPp
2016-03-10 15:01:58 +13:00
Jared Wein
309647569c Bug 1254312 - [e10s] Fix browser_plugin_enabled_state_locked.js to run in e10s. r=mconley, a=test-only
MozReview-Commit-ID: 4FDbMuNCbfV
2016-03-07 17:31:14 -05:00
Giorgio Maone
c51da12299 Bug 1253924 - Implement statusLine + fix & test statusCode r=kmag
MozReview-Commit-ID: BhyM10w8iGt
2016-03-06 16:59:07 +01:00
Eitan Isaacson
e628c99c32 Bug 1166365 - Add tests for narrate. r=Gijs
MozReview-Commit-ID: 84zRbvMimLV
2016-02-24 11:56:52 -08:00
Eitan Isaacson
318429c8a8 Bug 1166365 - Introduce Narrate feature in reader mode. r=Gijs
MozReview-Commit-ID: 6tJIu7C4eAv
2016-02-01 11:09:14 -08:00
Eitan Isaacson
ef07f1286d Bug 1166365 - Add some padding around paragraphs for nice highlighting. r=Gijs
MozReview-Commit-ID: 6LEDaLRmFmL
2016-01-27 13:48:44 -08:00
Eitan Isaacson
c50bce8e09 Bug 1166365 - Pluralize dropdown logic. r=Gijs,Margaret
MozReview-Commit-ID: KCayCX4r8xQ
2016-01-21 11:25:48 -08:00
Giorgio Maone
a7a24b6473 Bug 1232849 - Better chrome compatibility + binaryValue support + serious header manipulation tests + nits r=kmag
MozReview-Commit-ID: G8mgtVLFfoD
2016-03-06 09:02:06 +01:00
Ryan VanderMeulen
99e58783ef Bug 1198261 - Skip browser_navigateaway3.js on Windows and OSX for frequent failures. 2016-03-05 22:44:21 -05:00
Ryan VanderMeulen
13ad21c8b1 Merge m-c to inbound. a=merge 2016-03-05 19:30:51 -05:00
Ryan VanderMeulen
d3f5d4bd68 Merge fx-team to m-c. a=merge 2016-03-05 19:22:45 -05:00
Andrew Swan
05c5c4f04a Bug 1251766 - Accept more date formats for downloads.search(). r=kmag
MozReview-Commit-ID: K0r1wiY2lqf
2016-03-04 10:44:09 -08:00
Andrew Swan
1c397b830e Bug 1251766 - Add new Date type to webextensions schemas. r=kmag
MozReview-Commit-ID: EEX5FziiINo
2016-03-04 13:08:19 -08:00
Andrew Swan
4cd89a498c Bug 1245600 - Implement chrome.downloads.onChanged for state. r=kmag
MozReview-Commit-ID: BaAyU1dgMB7
2016-03-04 12:18:11 -08:00
bsilverberg
e41f4463e6 Bug 1252250 - Implement browser.bookmarks.removeTree(), r=kmag r=mak
MozReview-Commit-ID: HyjJrEjcsZu
2016-03-03 08:00:42 -05:00
Shane Caraveo
cc8625109d Bug 1252661 fix visibility state of pocket menu items, r=gijs 2016-03-04 14:38:13 -08:00
Michael Kaply
51f4a505cb Bug 1253365 - Merge version 1.4.0 of microformats-shiv; r=mixedpuppy 2016-03-04 11:19:18 -06:00
Alessio Placitelli
45c710ff62 Bug 1251199 - Define JSON schema for "core" ping. r=gfritzsche 2016-03-02 08:21:00 +01:00
Richard Marti
b7e1e7e5ec Bug 1028528 - Override the dropOn text color on Win Vista+ default theme. r=Gavin 2016-02-26 15:09:49 +01:00
Mike de Boer
5d17ca0675 Bug 1241930: Part 6 - convert all assertion methods used inside content tasks to the Assert.* family in toolkit tests. r=mconley 2016-03-04 14:32:34 +01:00
Carsten "Tomcat" Book
41362e0e1b Merge mozilla-central to fx-team 2016-03-04 13:40:08 +01:00
Carsten "Tomcat" Book
21bc5dab6b merge mozilla-inbound to mozilla-central a=merge 2016-03-04 11:49:58 +01:00
penhlenh
b06c52608b Bug 1251952 - about:telemetry should handle empty ping archives gracefully. r=gfritzsche 2016-03-03 08:04:10 +07:00
Manuel Casas Barrado
9f2f18a679 Bug 1208416 - Report on Hello MAUs per new MAU definition. r=mikedeboer,data-review=bsmedberg 2016-03-04 09:49:03 +00:00
Neil Deakin
762ea68f6b Bug 1246669 - Enable browser_viewsourceprefs.js for e10s. r=mconley 2016-03-04 09:01:00 +01:00
Andy McKay
e16a751dcd Bug 1246732 - Add in alarms schema. r=kmag
MozReview-Commit-ID: BQTVhvqgilb
2016-03-02 16:06:10 -08:00
Harshit Harchani
25235441df Bug 1245136 - Discard old-format pending Telemetry files. r=gfritzsche 2016-03-03 06:31:02 +05:30
Andrew Swan
b9f861bc36 Bug 1245603 - Implement browser.downloads.search(). r=kmag
MozReview-Commit-ID: 9XqkfZyeS8X
2016-03-02 10:23:55 -08:00
Nicholas Nethercote
2531368087 Bug 1252375 - Fix up jemalloc stats reporting. r=erahm.
We have some oddities in our jemalloc stats reporting.

- "heap-overhead-ratio" is a strange measurement: overhead / non-overhead,
  expressed as a percentage. And it omits "bin_unused", which appears to be an
  oversight.

- "heap-committed" also omits "bin_unused".

- There are some minor errors in memory report descriptions.

This patch fixes these and improves the heap reporting. It makes the following
reporting changes:

- "heap-allocated": Duplicated as "heap-committed/allocated". (We keep
  "heap-allocated" because that's a special value used in the computation of
  "heap-unclassified".)

- "heap-committed/overhead": Added; it's the same as the sum of the
  "explicit/heap-overhead/*" values. Together with "heap-committed/allocated"
  it shows clearly what fraction of the heap is overhead and what fraction is
  useful.

- "heap-committed": Removed; now implicit as the "heap-committed/" node.

- "heap-overhead-ratio":
  - Removed from memory reports; now shown as the percentage of the new
    "heap-committed/overhead" node.
  - Still available as a distinguished amount (because it's useful in
    isolation) but renamed to heapOverheadFraction, and the telemetry ID is
    renamed as MEMORY_HEAP_OVERHEAD_FRACTION.

- "heap-chunks": Removed; it's not that interesting, and can be manually
  computed as "heap-mapped" / "heap-chunksize" if necessary.
2016-03-03 12:49:27 +11:00
Kit Cambridge
1f33843b9c Back out changeset a67f0b208af6 (bug 1252250) for merge conflicts.
MozReview-Commit-ID: IQzGkqThQzG
2016-03-04 14:46:15 -08:00
J. Ryan Stinnett
ea852b1d8a Bug 1253125 - Stop duplicating telemetry from inside tools. r=mratcliffe
MozReview-Commit-ID: IRidYhLsJpy
2016-03-03 16:16:39 -06:00
Mark Finkle
7db883b487 Bug 1250967 - Extension inline options do not display, so add back setting.xml r=mossop 2016-03-03 13:11:35 -05:00
Carsten "Tomcat" Book
3712947f1d merge mozilla-inbound to mozilla-central a=merge 2016-03-03 11:54:40 +01:00
Gregory Szorc
70d4afa643 Bug 1250991 - Move APK upload files code to own file; r=mshal
This is several hundred lines of make goo that makes upload-files.mk
even harder to read than it actually is. Extract it to its own file.

I performed a `hg cp` to preserve file history so blame continues to
work.

MozReview-Commit-ID: IpoPE79m9SX
2016-03-02 16:30:03 -08:00
Gregory Szorc
47dcc3b9a5 Bug 1250991 - Indent code; r=mshal
This file is so hard to read. Add some indentation to make it easier to
grok.

I also converted some useless tabs to spaces.

MozReview-Commit-ID: 7DFKeW66uD6
2016-02-25 10:40:31 -08:00
Bobby Holley
7f5cea8d5e Bug 1252980 - Link the geckolib into libxul and define MOZ_STYLO if --with-servo=PATH is passed. r=gps 2016-03-02 16:43:12 -08:00
Wes Kocher
a1e52bece8 Backed out changeset 63132b94b6a3 (bug 1245603) for mochitest-chrome failures in test_chrome_ext_downloads_search.html
MozReview-Commit-ID: D1tlLwaDs6A
2016-03-02 12:42:37 -08:00
J. Ryan Stinnett
0af8bf06b1 Bug 1238160 - Rename OriginAttributes.mInBrowser and associated methods. r=bz,mayhemer
This change renames OriginAttributes.mInBrowser to mInIsolatedMozBrowser and
nsIPrincipal::GetIsInBrowserElement to GetIsInIsolatedMozBrowserElement.  Other
methods that pass these values around also have name changes.

Tokens such as "inBrowser" have previously been serialized into cache keys, used
as DB column names, stored in app registries, etc.  No changes are made to any
serialization formats.  Only runtime method and variable names are updated.

No behavior changes are made in this patch, so some renamed methods may have
nonsensical implementations.  These are corrected in subsequent patches
focused on behavior.

MozReview-Commit-ID: 66HfMlsXFLs
2016-03-02 10:35:56 -06:00
Carsten "Tomcat" Book
044a3f21fc Merge mozilla-central to mozilla-inbound 2016-03-02 16:09:27 +01:00
Carsten "Tomcat" Book
33a2ccf44e merge mozilla-inbound to mozilla-central a=merge 2016-03-02 15:54:19 +01:00
Wes Kocher
6e23a35025 Merge m-c to fx-team, a=merge
MozReview-Commit-ID: LQ4NtghbPdw
2016-03-01 15:30:35 -08:00