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
..
tps	Bug 811490 - Convert services/sync/tests/tps/test_privbrw_tabs.js to PB per window mode; r=ehsan,rnewman	2012-11-15 18:33:31 -06:00
unit	Merge m-c to s-c (including fixed conflict in Android Sync manifest).	2012-12-15 17:08:14 -08:00
Makefile.in	Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted	2012-08-04 20:26:44 +02:00