Jason Chen 0b6dfd78bb resolved conflicts for merge of '1d58e52a' into master ...

Change-Id: I783bc0e8cb0863dbe4c118515cefbe9e46f5254f

2010-10-11 09:24:33 -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

am 7bfac24d: am d7170b2a: am 65e62f4f: docs: new web apps dev guides

2010-10-10 19:13:36 -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

webapps

docs: new web apps dev guides

2010-10-08 15:19:27 -07:00

guide_toc.cs

resolved conflicts for merge of '1d58e52a' into master

2010-10-11 09:24:33 -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