Scott Main 88ffe75acd resolved conflicts for merge of 438fdfe8 to master

2009-09-03 09:41:39 -07:00

..

aapt.jd

auto import from //depot/cupcake/@135843

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

adb.jd

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

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

adt.jd

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

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

aidl.jd

Update docs: readFromParcel() is not necessary to make a class support

2009-08-17 10:35:49 -07:00

avd.jd

Add docs for SDK update.

2009-09-02 19:08:28 -07:00

ddms.jd

Minor updates to DDMS doc.

2009-04-27 10:38:50 -07:00

draw9patch.jd

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

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

emulator.jd

am 2fcba612: am 618ded26: am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake.

2009-09-02 19:18:57 -07:00

hierarchy-viewer.jd

auto import from //depot/cupcake/@135843

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

index.jd

docs only.

2009-09-02 20:17:16 -07:00

monkey.jd

auto import from //depot/cupcake/@135843

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

othertools.jd

AI 147242: am: CL 147239 am: CL 147238 Update tools index, replace activitycreator with android

2009-04-21 15:03:07 -07:00

traceview.jd

AI 148193: More misc fixes in format, links, content for Android 1.5 SDK docs.

2009-05-01 13:01:24 -07:00

zipalign.jd

docs only.

2009-09-02 20:17:16 -07:00