Bug 866253 - Provider manager calls undefined function this._recordError; r=rnewman
Merge mozilla-central into services-central