Scott Main e139f4df16 resolved conflicts for merge of 96f57d6c to master ...

Change-Id: I8ed2ca9143facaec56628d51ae51d9f95da91613

2011-01-07 17:53:59 -08:00

..

1.0_r1

…

1.0_r2

…

1.1_r1

docs: clean docs to use consistent "sidebox" classes (eliminate sidebox-inner)

2010-03-24 17:18:01 -07:00

1.5_r1

…

1.5_r2

…

1.5_r3

resolved conflicts for merge of bc1add83 to master

2009-11-17 11:13:31 -08:00

1.6_r1

…

api_diff

cherry pick from gingerbread: I14e59a2281fac9a437ebf52df4c846e7a1e9cc4a

2010-12-06 17:02:36 -08:00

images

cherry pick from gingerbread: I08a2f67d324484ed05b956c540facd69f9028563

2010-12-06 16:57:09 -08:00

ndk

resolved conflicts for merge of 96f57d6c to master

2011-01-07 17:53:59 -08:00

preview

docs: remove getting started guide for preview

2010-12-13 16:47:03 -08:00

adding-components.jd

cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df

2010-12-14 16:39:22 -08:00

adt_download.html

cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e

2010-12-14 17:55:27 -08:00

adt-notes.jd

cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo

2010-03-26 17:32:26 -07:00

android-1.1.jd

…

android-1.5-highlights.jd

…

android-1.5.jd

Doc change: clean up droiddoc (cs) macros.

2010-09-16 11:08:57 -07:00

android-1.6-highlights.jd

…

android-1.6.jd

Doc change: clean up droiddoc (cs) macros.

2010-09-16 11:08:57 -07:00

android-2.0-highlights.jd

…

android-2.0.1.jd

Doc change: clean up droiddoc (cs) macros.

2010-09-16 11:08:57 -07:00

android-2.0.jd

Doc change: clean up droiddoc (cs) macros.

2010-09-16 11:08:57 -07:00

android-2.1.jd

Doc change: clean up droiddoc (cs) macros.

2010-09-16 11:08:57 -07:00

android-2.2-highlights.jd

docs: add youtube video to highlights

2010-05-19 20:16:06 -07:00

android-2.2.jd

am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image

2010-10-19 17:29:29 -07:00

android-2.3-highlights.jd

resolved conflicts for merge of 96f57d6c to master

2011-01-07 17:53:59 -08:00

android-2.3.jd

resolved conflicts for merge of 96f57d6c to master

2011-01-07 17:53:59 -08:00

download.jd

docs: add redirect for download.html

2010-07-08 11:26:36 -07:00

eclipse-adt.jd

resolved conflicts for merge of 96f57d6c to master

2011-01-07 17:53:59 -08:00

index.jd

resolved conflicts for merge of 96f57d6c to master

2011-01-07 17:53:59 -08:00

installing.jd

Doc Change: Fixing broken links and miscellaneous text revisions to support link fixing

2011-01-06 17:34:06 -08:00

OLD_RELEASENOTES.jd

…

older_releases.jd

docs: fix misc broken links

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

RELEASENOTES.jd

Doc change: fixing links set 2

2011-01-05 11:03:46 -08:00

requirements.jd

cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e

2010-12-14 17:55:27 -08:00

sdk_toc.cs

resolved conflicts for merge of 96f57d6c to master

2011-01-07 17:53:59 -08:00

terms.jd

…

tools-notes.jd

Doc Change: Fixing broken links and miscellaneous text revisions to support link fixing

2011-01-06 17:34:06 -08:00

win-usb.jd

resolved conflicts for merge of 96f57d6c to master

2011-01-07 17:53:59 -08:00