2 Commits

Author	SHA1	Message	Date
Richard Newman	ae5fa5496d	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	2012-12-15 17:08:14 -08:00
Nick Alexander	2f7200362e	Bug 799729 - Generalize BaseResource authentication to support Basic-Auth, MAC, and Browser-ID. r=rnewman	2012-11-16 10:08:55 -08:00