Dirk Dougherty 5a93032dcb doc change: resolved conflicts for merge of 3c691a8d to gingerbread ...

Conflicts:
	docs/html/sdk/android-2.2.jd

Change-Id: I58f9503db8692df15dba1277a46e4c6eb338b438

2010-07-12 17:30:05 -07: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

…

preview

…

adding-components.jd

…

adt_download.jd

…

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

doc change: resolved conflicts for merge of 3c691a8d to gingerbread

2010-07-12 17:30:05 -07:00

download.jd

…

eclipse-adt.jd

…

index.jd

…

installing.jd

…

OLD_RELEASENOTES.jd

…

older_releases.jd

…

RELEASENOTES.jd

…

requirements.jd

…

sdk_toc.cs

…

terms.jd

…

tools-notes.jd

…

win-usb.jd

…