Bug 1068051 - Add high-res device drawables. r=trivial
Bug 1068051 - Post: Remove unnecessary style. r=trivial

This layout is not used by the Share Overlay system.  It is used only by
the Sync Send Tab Activity, which lives in android-sync.  Mixing the
styles in this way ties the repositories together in a way we don't
want.
Bug 1068365 - Part 1: Make collapsed remote clients look grayed out. r=rnewman

There are two major ways to achieve this.  One is to painstakingly
update UI elements every time we fetch a group.  I've done that.  The
other is to maintain expanded and collapsed layouts.  I went quite far
down that path; doing it is less pleasant than I expected for the
following reasons:

1) we have to update the view graphics depending on the client device
type anyway;

2) Android's view recycling does not track the expanded/collapsed state,
so we either manage the expanded states and have multiple group
types (see modern versions of SimpleExpandableListAdapter) or we
duplicate the work we're doing here;

3) our expanded and collapsed layouts are so similar that duplicating
them is worse than futzing with them in this manner.
Bug 1068365 - Part 2: Correct remote clients expanded/collapsed icons. r=antlam
Bug 1068366 - Update "Hidden devices" footer visual style in Remote Tabs home panel. r=trivial

The background colour was already correct.  This updates the text color
to match the mock, and adds a background selector that styles the footer
correctly when it is tapped.
Merge m-c to fx-team a=merge despite the CLOSED TREE
Bug 1072469: Change new tablet toolbar height to 60dp and menu buttons to 56x60dp. r=lucasr
Bug 1075341 - tests disabled in Linux due to bug 1073339 are now also disabled for e10s. r=unfocused

--HG--
extra : rebase_source : 633c203e3836223466d77b698053e04d25fb0d5d
No bug - Change tabs to spaces in MozLoopPushHandler.jsm r=me DONTBUILD
Bug 1071785 - Fix strict mode error in httpd.js. r=trivial
Bug 1045053 - Part 0: add descriptive comments for locale handling. r=me
Bug 1045053 - Part 1: set intl.accept_languages from Android OS/app locale. r=bnicholson
Bug 1045053 - Part 2: tests for OS locale handling. r=bnicholson
Bug 1053456 - Pass a serialized SSL status to the parent process so that "Add exception" from about:certerror works. r=dkeeler
Back out 0740fc10483c (bug 1072469) for robo* bustage
CLOSED TREE
Bug 1065306 - Part 1: s/suggestedsites-json/suggestedsites/. r=mshal

This is a mechanical change.  In future, we will probably want to
generate files not named like res/raw/file.json.  I'm not going to
handle res/not-raw right now; but I am going to handle not-file.json.
This smoothes that path.
Bug 1065306 - Part 2: Extract generated_file_template. r=mshal

This was essentially mechanical: s/$/$$/; s/suggestedsites/$(1)/; move
libs realchrome:: and GARBAGE rules into template.

I feel like there should be a more direct form of $$($(1)), but I can't
think of it.
Bug 1065306 - Part 3: Extract DotProperties helper. r=lucasr,mshal

The only substantive change here is to stop stripping the
'browser.suggestedsites.' prefix from each line when reading
region.properties.
Bug 1065306 - Part 4: Write localized res/raw-*/browsersearch.json. r=mshal
Bug 1065306 - Post: Handle utf-8 files in DotProperties. r=gps