Robert Ly 051d16ebec resolved conflicts for merge of 398d021b to master ...

Change-Id: I4f8a2cfec95bf31c38365da0257e8d13897bb197

2011-06-14 15:50:38 -07:00

..

appendix

docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74

2011-05-17 15:13:46 -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

Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f

2011-05-31 16:36:04 -07:00

market/billing

Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080

2011-05-05 15:49:25 -07:00

practices

am b9cb731b: am b7cfc618: am 28fb09e0: cherry pick Change-Id: I183ff47e59617b2c17a92b876ca8c8bcc9b45262 docs: add document for the compatibility library

2011-06-02 14:04:08 -07:00

publishing

docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74

2011-05-17 15:13:46 -07:00

samples

docs: add redirects to key legacy docs

2011-05-16 13:54:02 -07:00

topics

resolved conflicts for merge of 398d021b to master

2011-06-14 15:50:38 -07:00

tutorials

docs: add redirects to key legacy docs

2011-05-16 13:54:02 -07:00

webapps

docs: fix snippet errors in web doc

2011-04-15 17:55:33 -07:00

guide_toc.cs

cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a

2011-06-14 11:27:41 -07:00

index.jd

cherrypick Change-Id: Icf0c7772901f742c36ba417e07cc5e299f72849a

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