Scott Main c49f864695 resolved conflicts for merge of aaf8a9d8 to master

2009-12-16 11:08:26 -08:00

..

appendix

am f0165495: am 9d2252db: Merge change Ia36d8e74 into eclair

2009-12-16 10:32:29 -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 479a49f7: am 7585586c: Merge change Ib1eb2e9e into eclair

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

practices

am dd6a5895: am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.

2009-11-23 16:05:56 -08:00

publishing

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

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

samples

sdk doc change for esr: Cleanup for resources tab content.

2009-12-15 19:24:58 -08:00

topics

resolved conflicts for merge of aaf8a9d8 to master

2009-12-16 11:08:26 -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