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

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

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

..

images

donut snapshot

2009-05-20 11:28:04 -07:00

localization

SDK doc change per http://b/2158141 - adds new res wizard to L10N tutorial.

2009-10-12 16:17:42 -07:00

notepad

donut snapshot

2009-05-20 11:28:04 -07:00

views

manual merge of 85a2c7f because of trivial conflict

2009-09-01 13:52:19 -07:00

hello-world.jd

Merge commit '9b7fb57c' into manualmerge

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

index.html

auto import from //depot/cupcake/@135843

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