Bug 973727 - Unhide browser toolbar when reaching the end of the page. r=wesj
Bug 1016037 - Remove actor IDs from web audio editor's inspector. r=vp
Bug 1016613 - Replace RemoteTabsPanel view with ViewStub in tabs_panel.xml and created new layout file to inflate the ViewStub when user clicks on 3rd button in TabsPanel. r=mcomella

This was done in order to save on resources and not create the RemoteTabsPanel until needed
Bug 1034679 - Add isEnabledStateLocked property to visually disable plug-ins with locked states in Add-ons Manager. r=bsmedberg
Bug 1034679 - Visually display that plug-in states are locked in Add-ons Manager. r=Unfocused
Bug 1053315 - Catch more errors during upload; r=bsmedberg

If recording FHR data during uploading raised an exception, it could
potentially abort the upload. This would appear to Mozilla as clients
that suddenly stopped using Firefox.

This patch adds explicit exception trapping around event record to
ensure this doesn't happen.

--HG--
extra : rebase_source : 7cd207b08a4f62be55093c71cb56e28832fd39d8
extra : amend_source : 9144ecea16a013370fffa5c2e833af4ec528ef5b
Bug 1051830 - Unexpected in-the-middle completion in the urlbar. r=ttaubert
Bug 1039484 - Prevent closing WebIDE or switch to a new project if any file hasn't been saved. r=paul
Bug 1051136 - Wait for onEditorChange before opening menu in browser_projecteditor_menubar_02.js. r=mratcliffe
Bug 1053164 - Ensure that exception during debuggerserver instanciation are displayed. r=jryans
Backed out changeset 70cda3c55557 (bug 1016613) for robocop failures; CLOSED TREE
Backed out changeset 011c29fd2668 (bug 1016037) for webaudioeditor test failures; CLOSED TREE
Backed out changeset adaf86c7288e (bug 1034679)
Backed out changeset 79cbd825caac (bug 1034679) for crashes on Windows; CLOSED TREE
Bug 1051855 - window sharing indicator on the URL bar stays on after stream.stop has been called, r=Gijs.
Bug 1052779 - Clicking on Mac share icons does not get Firefox into focus, r=Enn.
Bug 830270 - Follow-up: Land other piece. r=trivial

This landed with only some of the changes from the android-sync
repository present.
Bug 1046020 - Include URI port in token server audiences. r=nalexander

========

https://github.com/mozilla-services/android-sync/commit/5b97feec9041d51bce9a8a03886af1206f41bce0
Author: Ben Curtis <androiddev@nosolutions.com>
    Bug 1046020 - Include URI port in token server audiences.

--HG--
extra : amend_source : 706eaa493e969ce27470aafd482f6b61f5f88db8
Bug 1052889 - Make Android Eclipse generate R.java. r=bnicholson

This patch does two things.  First, it adds the Search Activity sources
to the main Fennec Eclipse project (when enabled).  There's no reason
for a separate project for these, since they are built as part of the
main Fennec package by moz.build.

Second, it arranges for Eclipse to generate the R.java and Manifest.java
files for all Android libraries and ignores the files generated by
moz.build.  (The relevant classes are org.mozilla.{gecko,search}.R.)
This means renaming the FennecResources Eclipse project's package to
org.mozilla.gecko, and renaming the FennecResourcesSearch project's
package to org.mozilla.search.  To be consistent, I switched
org.mozilla.fennec.resources to org.mozilla.gecko throughout.

To accommodate the crash reporter resources, which depend on the static
and generated resources, I added a layer of indirection. By moving the
main resources into project FennecResourcesStatic, we can have (reading
indentation as "depends on"):

FennecResources
  FennecResourcesCrashReporter
    FennecResourcesStatic
    FennecResourcesGenerated
  FennecResourcesBranding

This lets us break the bidirectional dependency between FennecResources
and FennecResourcesCrashReporter.
Bug 1053494 - Android Eclipse support for Android v7 support libraries and Play Services. r=bnicholson