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

…

1.5_r1

…

1.5_r2

…

1.5_r3

…

1.6_r1

…

api_diff

…

images

…

ndk

resolved conflicts for merge of 96f57d6c to master

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

preview

…

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

…

android-1.1.jd

…

android-1.5-highlights.jd

…

android-1.5.jd

…

android-1.6-highlights.jd

…

android-1.6.jd

…

android-2.0-highlights.jd

…

android-2.0.1.jd

…

android-2.0.jd

…

android-2.1.jd

…

android-2.2-highlights.jd

…

android-2.2.jd

…

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

…

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

…

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