JDK 1.7 requires Android v19+.
No bug - Backport a bunch of trivial fixes from Fennec.
Bug 1002888 - Allow deleting Firefox Account from confirm account screen.
Bug 1002888 - Allow deleting Firefox Account from confirm account screen. r=nalexander
Bug 1098082: Merge identical catch branches. r=rnewman
Bug 1098082 - Merge identical catch branches. r=rnewman
Bug 1098082 - Follow-up: fix syntax error.
Bug 1098082 - Follow-up: fix bustage from ckitching not running tests.
Bug 1098082 - Follow-up: unify with fx-team. r=trival
No bug - Roll back overzealous rewrites. r=trivial

This code ships and is used; we can't avoid it.  We could override the
v9 API (apply) but we can't override the v10 API ({get,put}StringSet)
so let's not bother with either.
Bug 966103 - Part 1: Expose last synced times to Firefox Accounts.

There are a number of places this could go; I like this one because it's
easily available to consumers while being forward looking enough that I
can see us adding additional timestamps (in different prefs collections)
for additional services.  Other places include manually managed prefs
and hanging off the clients data delegate.
Bug 966103 - Part 2: Add a 'Sync now' button to the main FxA status screen.
Bug 966103 - Add a 'Sync now' button to the main FxA status screen. r=nalexander,rnewman
No bug - Import current AppConstants.
No bug - Import current Fennec strings.
Bug 966103 - Follow-up: Replace three dots with ellipsis. r=flod
Bug 1097220 - Part 1: extend ClientRecord and add fields to new local client records.
Bug 1097220 - Part 2: extend ClientsDatabase to support new optional fields.
Bug 1097220 - Part 3: extend TestClientsStage to cover new fields.
Bug 1097220 - Part 4: test that optional fields are initialized to null.