Jason Chen 1a469ca1cb Resolved conflicts for merge of 2bd6afed to master ...

Change-Id: Ic9e854838004e9c5505cc1df8399cee3caa5e4e9

2010-10-08 13:09:31 -07:00

..

appendix

docs: consistency fixit for the quickview boxes in the dev guide

2010-10-04 13:30:30 -07: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

Doc Change: add screenshots to Testing in Eclipse topic

2010-09-10 13:27:23 -07:00

practices

am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38

2010-10-04 15:39:24 -07:00

publishing

docs: consistency fixit for the quickview boxes in the dev guide

2010-10-04 13:30:30 -07:00

samples

docs: fix misc broken links

2010-07-02 11:11:34 -07:00

topics

Resolved conflicts for merge of 2bd6afed to master

2010-10-08 13:09:31 -07:00

tutorials

Fix up some issues with the onCreateContextMenu example in the Notepad tutorial.

2010-09-15 14:37:58 -07:00

guide_toc.cs

Resolved conflicts for merge of 2bd6afed to master

2010-10-08 13:09:31 -07: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