Merge mozilla-central to fx-team
commit7a70d4ebe314990e86ac3231f9012dc0aa54bfea
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 2 Nov 2015 11:05:19 +0000 (2 12:05 +0100)
committerCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 2 Nov 2015 11:05:19 +0000 (2 12:05 +0100)
tree271868a98983187aa02420d332e8cb16e3a66da1
parent6b617f5cb0f8456e720a03fdc5580fb180a4f066
parentc544f0d43095324dee33a8f02acea4497c57a232
Merge mozilla-central to fx-team
toolkit/components/perfmonitoring/nsPerformanceStats.cpp