Bug 1037353 - Don't show autocomplete popup after selecting an autocomplete value. r=jchen
Bug 1058146. r=nalexander
Bug 972079 - CardDAV Address Importer for Loop r=MattN
Bug 972079 - Tests for CardDav importer r=MattN
Bug 972079 - Fix memory leak failure in mochi test rs=me
Bug 984503 - Pre: Remove trailing newlines from previous commit. r=trivial

--HG--
extra : rebase_source : 30f414e7bb429ff1f4eebf78498ea586b41ea0d6
Bug 984503 - Add "Remove Firefox Account" menu option to FxAccount status activity. r=nalexander,rnewman

The menu is exposed as "More..." on devices that do not have a hardware
menu button.

========

https://github.com/mozilla-services/android-sync/commit/8adeb1be5750f32201688462239a9cbcbb3731b2
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 984503 - Part 4: Show a toast after removing Firefox Account.

========

https://github.com/mozilla-services/android-sync/commit/aeffca77dc3bca2a126e084e8b55576f1b702b54
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Thu Aug 28 15:05:11 2014 -0700

    Bug 984503 - Part 3: Hide "More..." option if device has a hardware menu button.

    The reason for this dance is to keep the "Remove Account" button out of
    view if at all possible.  I don't want to make it too easy to delete
    your account.

========

https://github.com/mozilla-services/android-sync/commit/4efe597308508722dd199bd5e0ad1e5293e0af3e
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Thu Aug 28 15:04:38 2014 -0700

    Bug 984503 - Part 2: Add "More..." to Firefox Account status list.

========

https://github.com/mozilla-services/android-sync/commit/ad6a55dc33cf062724fd780dc766f97ac74dd91d
Author: vivek <vivekb.balakrishnan@gmail.com>
Date:   Thu Aug 21 00:25:30 2014 +0300

    Bug 984503 - Part 1: Add menu option to remove Firefox Account.

--HG--
extra : rebase_source : 946b86baaa36de4b143d6d8a614f7cc3a2118a6a
Bug 1048882 follow-up - Change the string ID of feedback_window_will_close_in. r=standard8

--HG--
extra : rebase_source : 258a4aa681f6782f8e39302d14c3693d3adc2a2d
Bug 1058160 - Make o.m.g.BrowserApp LAUNCHER activity default and high priority. r=bnicholson

In order to launch in response to the MAIN activity (via |adb shell am
start -a android.intent.action.MAIN org.mozilla.fennec|, for example),
the activity must have category default.  That is added automatically to
<activity> elements that have category LAUNCHER, but apparently not to
<activity-alias> elements.  This patch adds it manually.

In general, <intent-filters> are prioritized by their order in the
manifest file.  To avoid future confusion, this patch bumps the
android:priority of the existing filter.

--HG--
extra : rebase_source : 021da06af2f3e41fc0f38eee7fc33360797f64b0
Bug 1057637 - Extract a re-usable ExpandableListAdapter out of RemoteTabsList. r=mcomella

This patch does a few other small things as well:

* It exposes the client device type.  This will be used later, as part of
  the visual refresh.
* Aligns the field names in remote_tabs_child with the names used by
  TwoLinePageRow.  This will be used later, when we finally use said
  standard view class.

--HG--
extra : rebase_source : 291f69a5f9b68801dd9154c5d291c6795d218ff6
Bug 1057629 - Use search plugins that ship with Fennec to populate options in search activity settings. r=bnicholson
Bug 1057634 - Use localized string for default search engine identifier. r=bnicholson
Backed out 2 changesets (bug 984503) for android build bustage

Backed out changeset 579667582c6a (bug 984503)
Backed out changeset 56c4334e838f (bug 984503)
Merge m-c to fx-team. a=merge
Bug 1045760 - Enhance tiles more specifically than eTLD+1/baseDomain (e.g., no enhance bugzilla.mozilla.org for mozilla.org) [r=dao]
Use all levels of subdomain except for common subdomains that are actually the same site.
Bug 1021804 - Long press on news story links invoke context menu, r=kats, wesj
Bug 984503 - Pre: Remove trailing newlines from previous commit. r=trivial
Bug 984503 - Add "Remove Firefox Account" menu option to FxAccount status activity. r=nalexander,rnewman

The menu is exposed as "More..." on devices that do not have a hardware
menu button.

========

https://github.com/mozilla-services/android-sync/commit/8adeb1be5750f32201688462239a9cbcbb3731b2
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 984503 - Part 4: Show a toast after removing Firefox Account.

========

https://github.com/mozilla-services/android-sync/commit/aeffca77dc3bca2a126e084e8b55576f1b702b54
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 984503 - Part 3: Hide "More..." option if device has a hardware menu button.

    The reason for this dance is to keep the "Remove Account" button out of
    view if at all possible.  I don't want to make it too easy to delete
    your account.

========

https://github.com/mozilla-services/android-sync/commit/4efe597308508722dd199bd5e0ad1e5293e0af3e
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Thu Aug 28 15:04:38 2014 -0700

    Bug 984503 - Part 2: Add "More..." to Firefox Account status list.

========

https://github.com/mozilla-services/android-sync/commit/ad6a55dc33cf062724fd780dc766f97ac74dd91d
Author: vivek <vivekb.balakrishnan@gmail.com>
Date:   Thu Aug 21 00:25:30 2014 +0300

    Bug 984503 - Part 1: Add menu option to remove Firefox Account.
Bug 984503 - Follow-up to fix build bustage. r=me
Bug 1058424 - Fixes network error tests in the FxA Profile Client r=mattn