Bug 424712 - Server location needs a slash at the end. r=rnewman
Merge m-c to s-c.
Bug 799729 - Generalize BaseResource authentication to support Basic-Auth, MAC, and Browser-ID. r=rnewman
Merge m-c to s-c.
Merge m-c to s-c.
Merge m-c to s-c.
Merge m-c to s-c.
Merge m-c to s-c so that bug 815807 won't break B2G tests on this tree
Merge m-c to s-c (with resource merges in mobile/android/base/resources/drawable/).

--HG--
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml.in
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml.in
rename : mobile/android/base/resources/drawable/address_bar_url.xml => mobile/android/base/resources/drawable/address_bar_url.xml.in
rename : mobile/android/base/resources/drawable/menu_level.xml => mobile/android/base/resources/drawable/menu_level.xml.in
rename : mobile/android/base/resources/drawable/tabs_button.xml => mobile/android/base/resources/drawable/tabs_button.xml.in
rename : mobile/android/base/resources/drawable/tabs_level.xml => mobile/android/base/resources/drawable/tabs_level.xml.in
Merge m-c to s-c.
Merge m-c to s-c.
Bug 818738 - Pass resultfile to the testrunner, a=test-only
Bug 818738 - Open resultfile with 'w' instead of 'a', a=test-only
Merge m-c to s-c.
Bug 819262 - Additional tests for bookmark application in Sync. r=gps
Merge m-c to s-c (including fixed conflict in Android Sync manifest).

--HG--
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml.in => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml
rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml.in => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml
rename : mobile/android/base/resources/drawable/tabs_button.xml.in => mobile/android/base/resources/drawable/tabs_button.xml
rename : mobile/android/base/resources/drawable/tabs_level.xml.in => mobile/android/base/resources/drawable/tabs_level.xml
Bug 818738 - Write all results to resultfile, not just most recent one, a=test-only
Merge m-c to s-c.
Bug 806494 - Part 1: additional logging and safety for header copying. r=gps
Bug 695127 - missing ; in chrome://browser/content/preferences/sync.js. r=trivial