Bug 956442 - Include version in desktop Sync client records. r=gps
Merge m-c to s-c
Bug 956935 - Include supported Sync protocol versions in Android client records. r=nalexander

--HG--
extra : amend_source : 67f9f5156f6e7a39a056cd5ef145a4fd10ec0b74
Bug 956935 - Follow-up: Fix bustage. r=me
Bug 956816 - Implement (de)serializing Android BrowserIDKeyPair instances. r=rnewman
Bug 955808 - Implement Android Firefox Account client that speaks "onepw" protocol. r=rnewman
Bug 955808 - Follow-up: Fix bustage. r=me
Merge m-c to s-c
Bug 937601 - HTTP cache v2: onCacheEntryCheck not called for R/O callbacks, r=michal
Bug 942835 - HTTP cache v2: Better CacheEntry purge prevention, r=michal
Bug 885294 - Immediate script selection from debugger search box is really janky and loses selection if you don't find anything, r=past
Bug 957097 - Turn GeckoActionProvider's max history size into a constant (r=wesj)
Merge mozilla-central to fx-team
Bug 873556 - Add a timestamp to closedWindows and closedTabs. r=ttaubert
Bug 888044 - [Australis] Hide the titlebar placeholder when menubar is shown. r=mconley, r=dao
Bug 948087 - Add the LOGTAG  to the log message produced by UITestContext.dumpLog() and update calls to this method to use the updated method declaration. r=mcomella
Bug 948849 - Forward nsIRequest's success status if not a HTTP request. r=bnicholson
Bug 952294 - Let devtools tooltip size be automatically set. r=miker
Bug 952708 - console.log escapes special characters. r=vporof
Bug 956678 - Replace TaskUtils.spawn() by Task.spawn() in Session Restore. r=yoric