Scott Main 952e39578d Merge commit '2f7b69aa' into manualmerge ...

Conflicts:
	docs/html/guide/topics/ui/themes.jd

2010-02-03 16:37:03 -08:00

..

appendix

am 6b113b1a: am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair

2010-01-11 13:50:42 -08:00

basics

sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.

2009-12-14 11:40:02 -08:00

developing

am 1076ea0a: am 9800adf2: Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair

2010-01-29 13:52:30 -08:00

practices

am b574cf87: am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair

2010-01-28 16:52:43 -08:00

publishing

am 98a48f0f: am 5da76ddd: doc change: Add ?details query to doc about Android Market.

2009-12-17 17:38:49 -08:00

samples

docs: fix some broken links

2009-12-21 12:23:47 -08:00

topics

Merge commit '2f7b69aa' into manualmerge

2010-02-03 16:37:03 -08:00

tutorials

am a292fefe: am 4c071f0d: am 59625fa8: am 946f9d1e: Merge change I020b31e1 into eclair-sdk

2009-10-28 23:54:35 -07:00

guide_toc.cs

am 479a49f7: am 7585586c: Merge change Ib1eb2e9e into eclair

2009-12-15 15:04:00 -08:00

index.jd

sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.

2009-12-14 11:40:02 -08:00