Scott Main 4eccd96f4a am c06e7abe: resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp ...

* commit 'c06e7abe6f37d1d8bc4f1c228964229d9f101d70':
  docs: move the SIP guide into guide/network/

2011-02-10 13:51:30 -08:00

..

appendix

Doc change: Add version notes for Android 2.3.3.

2011-02-09 14:04:10 -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

docs: fix a couple titles

2011-02-08 18:46:23 -08:00

market/billing

cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a

2011-02-08 09:24:03 -08:00

practices

Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide

2011-02-07 21:03:04 -08:00

publishing

Minor updates to Android Market Licensing Service docs.

2011-02-04 15:23:56 -08:00

samples

docs: fix misc broken links

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

topics

resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp

2011-02-10 13:47:32 -08:00

tutorials

cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a

2011-02-08 09:24:03 -08:00

webapps

cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821

2011-02-08 09:17:23 -08:00

guide_toc.cs

am c06e7abe: resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp

2011-02-10 13:51:30 -08:00

index.jd

cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a

2011-02-08 09:24:03 -08:00