Bug 960047 - Reset Sync promobox count for bookmark/add-on/passwords panels. r=gavin
[Australis] Bug 980374: adjust OSX toolbar buttons height to match urlbar and search bar. r=mconley
[Australis] Bug 980374: update browser_toolbarbutton_menu_context.js test. r=MattN
Bug 969592 - Restyle Australis' Bookmarks Menu Popups, r=mak
Bug 981418 - add onBeforeCreated handler for Australis widgets so add-ons have warning when their widget is created, and fix a race condition in the panelmultiview code that showed up in the automated test, r=jaws
Bug 982848: Don't clear syncKeyBundle in BrowserID Identity manager during failures to fetch token. r=markh

--HG--
extra : rebase_source : 42bccbef9e86cbc2f9e6113656acdddd04844f67
[Australis] Bug 980445: adjust Bookmarks button border state on hover and panel open. r=mconley
Bug 970769 - MenuBar flickers when I click History/Tools menu in the first time r=markh
Backed out changeset 92f37b7106a4 (bug 970769) on a CLOSED TREE r=bustage
Bug 978483 [Australis] add sidebar button image for winXP, r=Gijs
Bug 975528 - Add search component tests for Bing searches. r=MattN,gavin
Bug 982138 - Ignore #* in aapt invocations in mobile/android/base. r=blassey
Bug 979388 - Make aapt invocation rebuild R.java. r=glandium

This commit adds an empty recipe to dependencies of .aapt.deps, which
forces the appropriate gecko-R.jar rebuild.  This is because Make treats
targets with no recipe at all differently than targets with an empty
recipe, in a way that defeats our dependencies.

What appeared to be happening is the following:

Touch a resource.  On the next build, .aapt.deps is stale, so aapt is
invoked, which generates R.java, and we touch .aapt.deps.

Now R.java depends on .aapt.deps, but this does not appear to force Make
to consider targets that depend on R.java to be stale.  A target that
depends on R.java (such as gecko-R.jar) itself compares timestamps and
finds that gecko-R.jar is newer than R.java (from the previous build),
and this comparison appears to happen before aapt is invoked.  So even
though .aapt.deps is seen to be stale, and by transitivity R.java is
stale, this does not mark gecko-R.jar as stale.  The timestamp check
between R.java and gecko-R.jar appears to happen *before* aapt is
invoked.

On the second build following the update, the R.java generated in the
previous build is newer than gecko-R.jar, triggering the observed
rebuild of gecko-R.jar.
Bug 979537 - Make geckoview_resources.zip include res/values/strings.xml. r=trivial

The commit looks large, but it's trivial: just replacing $(android_res_files) with $(all_resources) in

+geckoview_resources.zip: $(all_resources) $(GLOBAL_DEPS)

It looks bigger because it needs to move below the definition of $(all_resources).
Bug 959640 - "Have a default icon for add-on SDK widgets in Australis' customization view" r=gijs

--HG--
extra : rebase_source : f435e4b8901fd8100fc78c39d74d0e8b250a0fa5
[Australis] Bug 978309: Introduce a checked state for toolbar buttons with type=checkbox. r=Gijs
Bug 970769 - MenuBar flickers when I click History/Tools menu in the first time r=markh
Merge m-c to fx-team
Bug 958447 - respect Retry-After header from token server. r=rnewman
Bug 974627 - Empty contentDescription throughout. r=rnewman