Dirk Dougherty 8eef2dd945 Merge commit '9b7fb57c' into manualmerge ...

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

2009-10-22 18:44:32 -07:00

..

faq

Fix all typos (found by script) in the Android documentation.

2009-08-21 13:10:55 -07:00

api-levels.jd

doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.

2009-10-22 00:59:47 -07:00

app-intents.jd

Fix all typos (found by script) in the Android documentation.

2009-08-21 13:10:55 -07:00

g-app-intents.jd

Fix all typos (found by script) in the Android documentation.

2009-08-21 13:10:55 -07:00

glossary.jd

Fix all typos (found by script) in the Android documentation.

2009-08-21 13:10:55 -07:00

index.jd

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

media-formats.jd

AI 149208: Remove statement about WIndows codecs and licensing.

2009-05-22 15:11:27 -07:00